openstack/openstacksdk
Code Issues Proposed changes

Merge "Refactor the test_create_volume_invalidates test"

Browse Source
This commit is contained in:
Jenkins 2017-04-30 22:05:20 +00:00 committed by Gerrit Code Review
commit d7be843574
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
shade/tests/unit/test_caching.py
View File

@ -248,53 +248,53 @@ class TestMemoryCache(base.RequestsMockTestCase):
self.assert_calls() self.assert_calls()
def test_create_volume_invalidates(self): def test_create_volume_invalidates(self):
fake_volb4 = fakes.FakeVolume('volume1', 'available', fake_volb4 = meta.obj_to_dict(
'Volume 1 Display Name') fakes.FakeVolume('volume1', 'available', ''))
fake_volb4_dict = meta.obj_to_dict(fake_volb4) _id = '12345'
fake_vol = fakes.FakeVolume('12345', 'creating', '') fake_vol_creating = meta.obj_to_dict(
fake_vol_dict = meta.obj_to_dict(fake_vol) fakes.FakeVolume(_id, 'creating', ''))
fake_vol_avail = meta.obj_to_dict(
def now_available(request, context): fakes.FakeVolume(_id, 'available', ''))
fake_vol.status = 'available'
fake_vol_dict['status'] = 'available'
return {'volume': fake_vol_dict}
def now_deleting(request, context): def now_deleting(request, context):
fake_vol.status = 'deleting' fake_vol_avail['status'] = 'deleting'
fake_vol_dict['status'] = 'deleting'
self.register_uris([ self.register_uris([
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
json={'volumes': [fake_volb4_dict]}), json={'volumes': [fake_volb4]}),
dict(method='POST', dict(method='POST',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes']), 'volumev2', 'public', append=['volumes']),
json={'volume': fake_vol_dict}), json={'volume': fake_vol_creating}),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', fake_vol.id]), 'volumev2', 'public', append=['volumes', _id]),
json=now_available), json={'volume': [fake_volb4, fake_vol_creating]}),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
json={'volumes': [fake_volb4_dict, fake_vol_dict]}), json={'volumes': [fake_volb4, fake_vol_creating]}),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
json={'volumes': [fake_volb4_dict, fake_vol_dict]}), json={'volumes': [fake_volb4, fake_vol_avail]}),
dict(method='GET',
uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']),
json={'volumes': [fake_volb4, fake_vol_avail]}),
dict(method='DELETE', dict(method='DELETE',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', fake_vol.id]), 'volumev2', 'public', append=['volumes', _id]),
json=now_deleting), json=now_deleting),
dict(method='GET', dict(method='GET',
uri=self.get_mock_url( uri=self.get_mock_url(
'volumev2', 'public', append=['volumes', 'detail']), 'volumev2', 'public', append=['volumes', 'detail']),
json={'volumes': [fake_volb4_dict]})]) json={'volumes': [fake_volb4]})])
self.assertEqual( self.assertEqual(
[self.cloud._normalize_volume(fake_volb4_dict)], [self.cloud._normalize_volume(fake_volb4)],
self.cloud.list_volumes()) self.cloud.list_volumes())
volume = dict(display_name='junk_vol', volume = dict(display_name='junk_vol',
size=1, size=1,
@ -304,14 +304,14 @@ class TestMemoryCache(base.RequestsMockTestCase):
# because the first volume was available and thus would already be # because the first volume was available and thus would already be
# cached. # cached.
self.assertEqual( self.assertEqual(
[self.cloud._normalize_volume(fake_volb4_dict), [self.cloud._normalize_volume(fake_volb4),
self.cloud._normalize_volume(fake_vol_dict)], self.cloud._normalize_volume(fake_vol_avail)],
self.cloud.list_volumes()) self.cloud.list_volumes())
self.cloud.delete_volume(fake_vol.id) self.cloud.delete_volume(_id)
# And now delete and check same thing since list is cached as all # And now delete and check same thing since list is cached as all
# available # available
self.assertEqual( self.assertEqual(
[self.cloud._normalize_volume(fake_volb4_dict)], [self.cloud._normalize_volume(fake_volb4)],
self.cloud.list_volumes()) self.cloud.list_volumes())
self.assert_calls() self.assert_calls()