openstack
/
charm-ceph
Code Issues Proposed changes

update to use correct(?) commands

This commit is contained in:
Chris MacNaughton 2016-01-22 10:47:26 -05:00
parent b762e9842c
commit 8cb53237c6
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/basic_deployment.py
View File

@ -443,8 +443,10 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
cmd = "ceph -s"
sentry_unit = self.ceph0_sentry
action_id = self.action_do(sentry_unit, 'pause')
self.action_fetch(action_id)
# action_id = self.action_do(sentry_unit, 'pause')
action_id = u.run_action(sentry, 'pause')
# self.action_fetch(action_id)
assert u.wait_on_action(action_id), "Pause action failed."
output, code = sentry_unit.run(cmd)
import re
@ -452,8 +454,8 @@ class CephBasicDeployment(OpenStackAmuletDeployment):
amulet.raise_status(amulet.FAIL, msg="Missing noout,nodown")
u.log.debug("Testing resume")
action_id = self.action_do(sentry_unit, 'resume')
self.action_fetch(action_id)
action_id = u.run_action(sentry, 'resume')
assert u.wait_on_action(action_id), "Resume action failed."
output, code = sentry_unit.run(cmd)
if re.match('flags nodown,noout', output) is not None:
amulet.raise_status(amulet.FAIL, msg="Still has noout,nodown")