From 2c65bf7f1a6e2dc0a17d321bb65ae7c2c2f80e19 Mon Sep 17 00:00:00 2001 From: Szymon Datko Date: Tue, 16 May 2017 15:17:45 +0000 Subject: [PATCH] Fixed tests due to updated oslo.config Change-Id: Ib7923543862275629d86a0fa76baa88722493bad Closes-Bug: #1691132 --- glance_store/tests/unit/test_rbd_store.py | 2 +- glance_store/tests/unit/test_swift_store.py | 18 ++++-------------- glance_store/tests/unit/test_vmware_store.py | 3 ++- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/glance_store/tests/unit/test_rbd_store.py b/glance_store/tests/unit/test_rbd_store.py index 4d1f077..9765aa3 100644 --- a/glance_store/tests/unit/test_rbd_store.py +++ b/glance_store/tests/unit/test_rbd_store.py @@ -388,7 +388,7 @@ class TestStore(base.StoreBaseTest, @mock.patch.object(MockRados.Rados, 'connect') def test_rados_connect_timeout(self, mock_rados_connect): - socket_timeout = 1.5 + socket_timeout = 1 self.config(rados_connect_timeout=socket_timeout) self.store.configure() with self.store.get_connection('conffile', 'rados_id'): diff --git a/glance_store/tests/unit/test_swift_store.py b/glance_store/tests/unit/test_swift_store.py index da91f00..a3f84fe 100644 --- a/glance_store/tests/unit/test_swift_store.py +++ b/glance_store/tests/unit/test_swift_store.py @@ -1900,22 +1900,12 @@ class TestMultipleContainers(base.StoreBaseTest): self.assertEqual(expected, actual) def test_get_container_name_with_negative_seed(self): - self.config(swift_store_multiple_containers_seed=-1) - self.store = swift.SingleTenantStore(self.conf) - - test_image_id = 'random_id' - self.assertRaises(exceptions.BadStoreConfiguration, - self.store.get_container_name, test_image_id, - 'default_container') + self.assertRaises(ValueError, self.config, + swift_store_multiple_containers_seed=-1) def test_get_container_name_with_seed_beyond_max(self): - self.config(swift_store_multiple_containers_seed=33) - self.store = swift.SingleTenantStore(self.conf) - - test_image_id = 'random_id' - self.assertRaises(exceptions.BadStoreConfiguration, - self.store.get_container_name, test_image_id, - 'default_container') + self.assertRaises(ValueError, self.config, + swift_store_multiple_containers_seed=33) def test_get_container_name_with_max_seed(self): self.config(swift_store_multiple_containers_seed=32) diff --git a/glance_store/tests/unit/test_vmware_store.py b/glance_store/tests/unit/test_vmware_store.py index 03964bd..6c06b8d 100644 --- a/glance_store/tests/unit/test_vmware_store.py +++ b/glance_store/tests/unit/test_vmware_store.py @@ -83,7 +83,8 @@ class TestStore(base.StoreBaseTest, super(TestStore, self).setUp() vm_store.Store.CHUNKSIZE = 2 - self.config(default_store='vmware', stores=['vmware']) + default_store = VMWARE_DS['default_store'] + self.config(default_store=default_store, stores=['vmware']) backend.register_opts(self.conf) self.config(group='glance_store', vmware_server_username='admin',