openstack
/
charm-swift-proxy
Code Issues Proposed changes

Sync from tealeg's charm-helpers branch, add tests for status (tealeg's review)

This commit is contained in:
Adam Collard 2015-09-09 11:17:10 +01:00
parent fc504e24bb
commit b2b6b8f3f2
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tests/basic_deployment.py
View File

@ -353,6 +353,15 @@ class SwiftProxyBasicDeployment(OpenStackAmuletDeployment):
assert u.wait_on_action(pause_action_id), "Pause action failed."
self._assert_services(should_run=False)
status, message = u.status_get(self.swift_proxy_sentry)
if status != "maintenance":
msg = ("Pause action failed to move unit to maintenance "
"status (got {} instead)".format(status))
amulet.raise_status(amulet.FAIL, msg=msg)
if message != "Paused. Use 'resume' action to resume normal service.":
msg = ("Pause action failed to set message"
" (got {} instead)".format(message))
amulet.raise_status(amulet.FAIL, msg=msg)
def _test_resume(self):
u.log.info("Testing resume action")
@ -362,6 +371,15 @@ class SwiftProxyBasicDeployment(OpenStackAmuletDeployment):
assert u.wait_on_action(resume_action_id), "Resume action failed."
self._assert_services(should_run=True)
status, message = u.status_get(self.swift_proxy_sentry)
if status != "active":
msg = ("Resume action failed to move unit to active "
"status (got {} instead)".format(status))
amulet.raise_status(amulet.FAIL, msg=msg)
if message != "":
msg = ("Resume action failed to clear message"
" (got {} instead)".format(message))
amulet.raise_status(amulet.FAIL, msg=msg)
def test_z_pause_resume_actions(self):
"""Pause and then resume swift-proxy."""

9
tests/charmhelpers/contrib/amulet/utils.py
View File

@ -594,3 +594,12 @@ class AmuletUtils(object):
output = _check_output(command, universal_newlines=True)
data = json.loads(output)
return data.get(u"status") == "completed"
def status_get(self, unit):
"""Return the current service status of this unit."""
raw_status, return_code = unit.run(
"status-get --format=json --include-data")
if return_code != 0:
return ("unknown", "")
status = json.loads(raw_status)
return (status["status"], status["message"])