diff --git a/swsync/filler.py b/swsync/filler.py index 4be7624..7f5c15a 100644 --- a/swsync/filler.py +++ b/swsync/filler.py @@ -239,7 +239,7 @@ def create_containers(cnx, acc, c_amount, index_containers=None): try: cnx.put_container(container_name, headers=copy.copy(meta)) containers_d[container_name] = {'meta': meta, 'objects': []} - except ClientException, e: + except(ClientException), e: logging.warning("Unable to create container %s due to %s" % (container_name.encode('ascii', 'ignore'), e)) diff --git a/swsync/objects.py b/swsync/objects.py index ae95682..40730b2 100644 --- a/swsync/objects.py +++ b/swsync/objects.py @@ -98,7 +98,7 @@ def delete_object(dest_cnx, http_conn=dest_cnx, name=object_name) -import swift.common.utils + def sync_object(orig_storage_url, orig_token, dest_storage_url, dest_token, container_name, object_name_etag): object_name = object_name_etag[1] diff --git a/tests/units/test_accounts.py b/tests/units/test_accounts.py index 6f014ff..8d9264f 100644 --- a/tests/units/test_accounts.py +++ b/tests/units/test_accounts.py @@ -101,8 +101,8 @@ class TestAccountSyncMetadata(TestAccountBase): post_account_called=post_account_called, get_account_called=get_account_called) - self.assertEquals(len(sync_container_called), 1) - self.assertEquals(len(get_account_called), 2) + self.assertEqual(len(sync_container_called), 1) + self.assertEqual(len(get_account_called), 2) self.assertTrue(info_called) self.assertIn('x-account-meta-life', @@ -134,8 +134,8 @@ class TestAccountSyncMetadata(TestAccountBase): post_account_called=post_account_called, get_account_called=get_account_called) - self.assertEquals(len(sync_container_called), 1) - self.assertEquals(len(get_account_called), 2) + self.assertEqual(len(sync_container_called), 1) + self.assertEqual(len(get_account_called), 2) self.assertTrue(info_called) self.assertIn('x-account-meta-life', @@ -167,8 +167,8 @@ class TestAccountSyncMetadata(TestAccountBase): post_account_called=post_account_called, get_account_called=get_account_called) - self.assertEquals(len(sync_container_called), 1) - self.assertEquals(len(get_account_called), 2) + self.assertEqual(len(sync_container_called), 1) + self.assertEqual(len(get_account_called), 2) self.assertTrue(info_called) self.assertIn('x-account-meta-life', @@ -212,7 +212,7 @@ class TestAccountSync(TestAccountBase): ret = self.accounts_cls.get_swift_auth( "http://test.com", tenant_name, "user", "password") tenant_id = fakes.TENANTS_LIST[tenant_name]['id'] - self.assertEquals(ret[0], "%s/v1/AUTH_%s" % (fakes.STORAGE_DEST, + self.assertEqual(ret[0], "%s/v1/AUTH_%s" % (fakes.STORAGE_DEST, tenant_id)) def test_get_ks_auth_orig(self): @@ -220,11 +220,11 @@ class TestAccountSync(TestAccountBase): k = fakes.CONFIGDICT['auth']['keystone_origin_admin_credentials'] tenant_name, username, password = k.split(':') - self.assertEquals(kwargs['tenant_name'], tenant_name) - self.assertEquals(kwargs['username'], username) - self.assertEquals(kwargs['password'], password) + self.assertEqual(kwargs['tenant_name'], tenant_name) + self.assertEqual(kwargs['username'], username) + self.assertEqual(kwargs['password'], password) k = fakes.CONFIGDICT['auth']['keystone_origin'] - self.assertEquals(k, kwargs['auth_url']) + self.assertEqual(k, kwargs['auth_url']) def test_process(self): ret = [] @@ -240,7 +240,7 @@ class TestAccountSync(TestAccountBase): for x in fakes.TENANTS_LIST) ret_orig_storage_id = sorted( x[0][x[0].find('AUTH_') + 5:] for x in ret) - self.assertEquals(tenant_list_ids, ret_orig_storage_id) + self.assertEqual(tenant_list_ids, ret_orig_storage_id) [self.assertTrue(y[1].startswith(fakes.STORAGE_DEST)) for y in ret] def test_sync_account(self): @@ -270,7 +270,7 @@ class TestAccountSync(TestAccountBase): ret_container_list = sorted(x[7] for x in ret) default_container_list = sorted(x[0]['name'] for x in fakes.CONTAINERS_LIST) - self.assertEquals(ret_container_list, default_container_list) + self.assertEqual(ret_container_list, default_container_list) def test_sync_exception_get_account(self): called = [] diff --git a/tests/units/test_containers.py b/tests/units/test_containers.py index 0445102..c881033 100644 --- a/tests/units/test_containers.py +++ b/tests/units/test_containers.py @@ -104,8 +104,8 @@ class TestContainersSyncMetadata(TestContainersBase): post_called, info_called) self.assertEqual(len(get_called), 2) self.assertEqual(len(post_called), 1) - self.assertEquals(post_called[0]['x-container-meta-psg'], '') - self.assertEquals(post_called[0]['x-container-meta-om'], 'enkl') + self.assertEqual(post_called[0]['x-container-meta-psg'], '') + self.assertEqual(post_called[0]['x-container-meta-om'], 'enkl') self.assertIn('HEADER: sync headers: cont1', info_called) def test_sync_containers_metada_added_on_orig(self): @@ -130,7 +130,7 @@ class TestContainersSyncMetadata(TestContainersBase): self.assertIn('HEADER: sync headers: cont1', info_called) self.assertEqual(len(get_called), 2) self.assertEqual(len(post_called), 1) - self.assertEquals(post_called[0]['x-container-meta-om'], 'enkl') + self.assertEqual(post_called[0]['x-container-meta-om'], 'enkl') def test_sync_containers_metada_changed(self): get_called = [] @@ -153,7 +153,7 @@ class TestContainersSyncMetadata(TestContainersBase): post_called, info_called) self.assertEqual(len(get_called), 2) self.assertEqual(len(post_called), 1) - self.assertEquals(post_called[0]['x-container-meta-psg'], 'magic') + self.assertEqual(post_called[0]['x-container-meta-psg'], 'magic') self.assertIn('HEADER: sync headers: cont1', info_called) def test_sync_containers_metadata_raise_client(self): diff --git a/tests/units/test_middleware_lm.py b/tests/units/test_middleware_lm.py index e692b22..e353f18 100644 --- a/tests/units/test_middleware_lm.py +++ b/tests/units/test_middleware_lm.py @@ -53,11 +53,11 @@ class TestLastModifiedMiddleware(unittest.TestCase): def test_denied_method_conf(self): app = FakeApp() test = middleware.filter_factory({})(app) - self.assertEquals(test.key_name, 'Last-Modified') + self.assertEqual(test.key_name, 'Last-Modified') test = middleware.filter_factory({'key_name': "Last Modified"})(app) - self.assertEquals(test.key_name, 'Last-Modified') + self.assertEqual(test.key_name, 'Last-Modified') test = middleware.filter_factory({'key_name': "Custom Key"})(app) - self.assertEquals(test.key_name, 'Custom-Key') + self.assertEqual(test.key_name, 'Custom-Key') def test_PUT_on_container(self): self.called = False diff --git a/tests/units/test_objects.py b/tests/units/test_objects.py index ce996fc..be11126 100644 --- a/tests/units/test_objects.py +++ b/tests/units/test_objects.py @@ -158,7 +158,7 @@ class TestObject(test_base.TestCase): "cont1", "obj1") self.assertIn('x-foo', headers) - self.assertEquals(headers['x-foo'], 'BaR') + self.assertEqual(headers['x-foo'], 'BaR') def test_get_object_over_conn_timeout(self): new_connect = fake_http_connect(200, connect_waitfor=2)