diff options
| author | Tim Burke <tim.burke@gmail.com> | 2016-03-23 10:05:37 -0700 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2016-03-24 13:06:42 -0700 |
| commit | f86b2d8138f5c366d0f8ab8e8cb2492d9cd07ca4 (patch) | |
| tree | 1cf9b6a4fe1124ac50b393df93555a7d76f10170 | |
| parent | 51a8a5a7ae3a065307974791ed1dd43503fb3b5a (diff) | |
| download | python-swiftclient-f86b2d8138f5c366d0f8ab8e8cb2492d9cd07ca4.tar.gz | |
Clean up some unnecessary variables
Change-Id: Iac93ced6344d4a6fee7e6390e891fde765814c03
| -rw-r--r-- | tests/unit/test_service.py | 50 |
1 files changed, 22 insertions, 28 deletions
diff --git a/tests/unit/test_service.py b/tests/unit/test_service.py index a392967..e9310aa 100644 --- a/tests/unit/test_service.py +++ b/tests/unit/test_service.py @@ -1655,16 +1655,15 @@ class TestServiceDownload(_TestServiceBase): self.assertEqual(expected_r, actual_r) def test_download(self): - service = SwiftService() with mock.patch('swiftclient.service.Connection') as mock_conn: header = {'content-length': self.obj_len, 'etag': self.obj_etag} mock_conn.get_object.return_value = header, self._readbody() - resp = service._download_object_job(mock_conn, - 'c', - 'test', - self.opts) + resp = SwiftService()._download_object_job(mock_conn, + 'c', + 'test', + self.opts) self.assertIsNone(resp.get('error')) self.assertIs(True, resp['success']) @@ -1689,7 +1688,6 @@ class TestServiceDownload(_TestServiceBase): self.assertEqual(True, mock_down_cont.called) def test_download_with_output_dir(self): - service = SwiftService() with mock.patch('swiftclient.service.Connection') as mock_conn: header = {'content-length': self.obj_len, 'etag': self.obj_etag} @@ -1697,10 +1695,10 @@ class TestServiceDownload(_TestServiceBase): options = self.opts.copy() options['out_directory'] = 'temp_dir' - resp = service._download_object_job(mock_conn, - 'c', - 'example/test', - options) + resp = SwiftService()._download_object_job(mock_conn, + 'c', + 'example/test', + options) self.assertIsNone(resp.get('error')) self.assertIs(True, resp['success']) @@ -1709,7 +1707,6 @@ class TestServiceDownload(_TestServiceBase): self.assertEqual(resp['path'], 'temp_dir/example/test') def test_download_with_remove_prefix(self): - service = SwiftService() with mock.patch('swiftclient.service.Connection') as mock_conn: header = {'content-length': self.obj_len, 'etag': self.obj_etag} @@ -1718,10 +1715,10 @@ class TestServiceDownload(_TestServiceBase): options = self.opts.copy() options['prefix'] = 'example/' options['remove_prefix'] = True - resp = service._download_object_job(mock_conn, - 'c', - 'example/test', - options) + resp = SwiftService()._download_object_job(mock_conn, + 'c', + 'example/test', + options) self.assertIsNone(resp.get('error')) self.assertIs(True, resp['success']) @@ -1730,7 +1727,6 @@ class TestServiceDownload(_TestServiceBase): self.assertEqual(resp['path'], 'test') def test_download_with_remove_prefix_and_remove_slashes(self): - service = SwiftService() with mock.patch('swiftclient.service.Connection') as mock_conn: header = {'content-length': self.obj_len, 'etag': self.obj_etag} @@ -1739,10 +1735,10 @@ class TestServiceDownload(_TestServiceBase): options = self.opts.copy() options['prefix'] = 'example' options['remove_prefix'] = True - resp = service._download_object_job(mock_conn, - 'c', - 'example/test', - options) + resp = SwiftService()._download_object_job(mock_conn, + 'c', + 'example/test', + options) self.assertIsNone(resp.get('error')) self.assertIs(True, resp['success']) @@ -1751,7 +1747,6 @@ class TestServiceDownload(_TestServiceBase): self.assertEqual(resp['path'], 'test') def test_download_with_output_dir_and_remove_prefix(self): - service = SwiftService() with mock.patch('swiftclient.service.Connection') as mock_conn: header = {'content-length': self.obj_len, 'etag': self.obj_etag} @@ -1761,10 +1756,10 @@ class TestServiceDownload(_TestServiceBase): options['prefix'] = 'example' options['out_directory'] = 'new/dir' options['remove_prefix'] = True - resp = service._download_object_job(mock_conn, - 'c', - 'example/test', - options) + resp = SwiftService()._download_object_job(mock_conn, + 'c', + 'example/test', + options) self.assertIsNone(resp.get('error')) self.assertIs(True, resp['success']) @@ -2153,18 +2148,17 @@ class TestServicePost(_TestServiceBase): "test_spo", {'meta': ["meta1:test2"], "header": ["hdr1:test2"]}) - service = SwiftService() SwiftService().post('test_c', ['test_o', spo], self.opts) calls = [ mock.call( - service._post_object_job, 'test_c', 'test_o', + SwiftService._post_object_job, 'test_c', 'test_o', { "X-Object-Meta-Meta1": "test1", "Hdr1": "test1"}, {}), mock.call( - service._post_object_job, 'test_c', 'test_spo', + SwiftService._post_object_job, 'test_c', 'test_spo', { "X-Object-Meta-Meta1": "test2", "Hdr1": "test2"}, |