openstack
/
deb-python-glance-store
Code Issues Proposed changes

Fixed tests due to updated oslo.config 

Change-Id: Ib7923543862275629d86a0fa76baa88722493bad
Closes-Bug: #1691132
This commit is contained in:
Szymon Datko 2017-05-16 15:17:45 +00:00 committed by Brian Rosmaita
parent a783a7442b
commit 2c65bf7f1a
3 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glance_store/tests/unit/test_rbd_store.py
View File

@ -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'):

18
glance_store/tests/unit/test_swift_store.py
View File

@ -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)

3
glance_store/tests/unit/test_vmware_store.py
View File

@ -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',