openstack/trove
Code Issues Proposed changes

Merge "Makes two tests wait for the instance to go ACTIVE"

Browse Source
This commit is contained in:
Jenkins 2013-07-22 21:36:18 +00:00 committed by Gerrit Code Review
commit a9eb50ec60
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
trove/tests/api/instances_actions.py
View File

@ -424,6 +424,14 @@ class ResizeInstanceTest(ActionTestBase):
flavor_name = CONFIG.values.get('instance_bigger_eph_flavor_name', flavor_name = CONFIG.values.get('instance_bigger_eph_flavor_name',
'eph.rd-smaller') 'eph.rd-smaller')
flavors = self.dbaas.find_flavors_by_name(flavor_name) flavors = self.dbaas.find_flavors_by_name(flavor_name)
def is_active():
return self.instance.status == 'ACTIVE'
poll_until(is_active, time_out=TIME_OUT_TIME)
assert_equal(self.instance.status, 'ACTIVE')
old_flavor_href = self.get_flavor_href(
flavor_id=self.expected_old_flavor_id)
assert_raises(HTTPNotImplemented, self.dbaas.instances.resize_instance, assert_raises(HTTPNotImplemented, self.dbaas.instances.resize_instance,
self.instance_id, flavors[0].id) self.instance_id, flavors[0].id)
@ -531,9 +539,16 @@ class ResizeInstanceTest(ActionTestBase):
@time_out(TIME_OUT_TIME) @time_out(TIME_OUT_TIME)
def test_resize_down(self): def test_resize_down(self):
expected_dbaas_flavor = self.expected_dbaas_flavor expected_dbaas_flavor = self.expected_dbaas_flavor
self.dbaas.instances.resize_instance(
self.instance_id, def is_active():
self.get_flavor_href(flavor_id=self.expected_old_flavor_id)) return self.instance.status == 'ACTIVE'
poll_until(is_active, time_out=TIME_OUT_TIME)
assert_equal(self.instance.status, 'ACTIVE')
old_flavor_href = self.get_flavor_href(
flavor_id=self.expected_old_flavor_id)
self.dbaas.instances.resize_instance(self.instance_id, old_flavor_href)
assert_equal(202, self.dbaas.last_http_code) assert_equal(202, self.dbaas.last_http_code)
self.old_dbaas_flavor = instance_info.dbaas_flavor self.old_dbaas_flavor = instance_info.dbaas_flavor
instance_info.dbaas_flavor = expected_dbaas_flavor instance_info.dbaas_flavor = expected_dbaas_flavor