diff options
author | Christopher Bartz <bartz@dkrz.de> | 2017-07-06 17:30:48 +0200 |
---|---|---|
committer | Tim Burke <tim.burke@gmail.com> | 2017-07-06 10:19:12 -0700 |
commit | cde73c196d4f161b227fb924cd59cf02eaa33c03 (patch) | |
tree | 6e4314a1d68974f4f00ab90b7162ab83e33f9e6b /tests | |
parent | 1d57403668815ab8cef9d6598c06bf1c7e5355c0 (diff) | |
download | python-swiftclient-cde73c196d4f161b227fb924cd59cf02eaa33c03.tar.gz |
Option to ignore mtime metadata entry.
Currently, the swiftclient upload command passes a custom metadata
header for each object (called object-meta-mtime), whose value is
the current UNIX timestamp. When downloading such an object with the
swiftclient, the mtime header is parsed and passed as the atime and
mtime for the newly created file.
There are use-cases where this is not desired, for example when using
tmp or scratch directories in which files older than a specific date
are deleted. This commit provides a boolean option for ignoring the
mtime header.
Change-Id: If60b389aa910c6f1969b999b5d3b6d0940375686
Diffstat (limited to 'tests')
-rw-r--r-- | tests/unit/test_service.py | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/tests/unit/test_service.py b/tests/unit/test_service.py index b759e6b..6490b3f 100644 --- a/tests/unit/test_service.py +++ b/tests/unit/test_service.py @@ -2051,6 +2051,52 @@ class TestServiceDownload(_TestServiceBase): ) self.assertEqual(expected_r, actual_r) + def test_download_object_job_ignore_mtime(self): + mock_conn = self._get_mock_connection() + objcontent = six.BytesIO(b'objcontent') + mock_conn.get_object.side_effect = [ + ({'content-type': 'text/plain', + 'etag': '2cbbfe139a744d6abbe695e17f3c1991', + 'x-object-meta-mtime': '1454113727.682512'}, + objcontent) + ] + expected_r = self._get_expected({ + 'success': True, + 'start_time': 1, + 'finish_time': 2, + 'headers_receipt': 3, + 'auth_end_time': 4, + 'read_length': len(b'objcontent'), + }) + + with mock.patch.object(builtins, 'open') as mock_open, \ + mock.patch('swiftclient.service.utime') as mock_utime: + written_content = Mock() + mock_open.return_value = written_content + s = SwiftService() + _opts = self.opts.copy() + _opts['no_download'] = False + _opts['ignore_mtime'] = True + actual_r = s._download_object_job( + mock_conn, 'test_c', 'test_o', _opts) + actual_r = dict( # Need to override the times we got from the call + actual_r, + **{ + 'start_time': 1, + 'finish_time': 2, + 'headers_receipt': 3 + } + ) + mock_open.assert_called_once_with('test_o', 'wb') + self.assertEqual([], mock_utime.mock_calls) + written_content.write.assert_called_once_with(b'objcontent') + + mock_conn.get_object.assert_called_once_with( + 'test_c', 'test_o', resp_chunk_size=65536, headers={}, + response_dict={} + ) + self.assertEqual(expected_r, actual_r) + def test_download_object_job_exception(self): mock_conn = self._get_mock_connection() mock_conn.get_object = Mock(side_effect=self.exc) |