openstack/charm-glance
Code Issues Proposed changes

Fix test.

Browse Source
This commit is contained in:
Alberto Donato
2015-09-28 10:51:23 +03:00
parent d9f34b3261
commit 1f53e6ac9a
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/basic_deployment.py
View File

@@ -47,16 +47,6 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
{self.glance_sentry: self.SERVICES},
expect_success=should_run)
def get_service_overrides(self, unit):
"""
Return a dict mapping service names to a boolean indicating whether
an override file exists for that service.
"""
init_contents = unit.directory_contents("/etc/init/")
return {
service: "{}.override".format(service) in init_contents["files"]
for service in self.SERVICES}
def _add_services(self):
"""Add services
@@ -571,11 +561,7 @@ class GlanceBasicDeployment(OpenStackAmuletDeployment):
assert u.wait_on_action(action_id), "Pause action failed."
self._assert_services(should_run=False)
assert all(self.get_service_overrides(unit).itervalues()), \
"Not all override files were created."
action_id = u.run_action(unit, "resume")
assert u.wait_on_action(action_id), "Resume action failed"
assert not any(self.get_service_overrides(unit).itervalues()), \
"Not all override files were removed."
self._assert_services(should_run=True)