openstack/swift
Code Issues Proposed changes

Merge "Don't run probe tests if resetswift failed"

Browse Source
This commit is contained in:
Jenkins 2016-08-18 04:54:18 +00:00 committed by Gerrit Code Review
commit 72c3163be8
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/probe/common.py
View File

@ -266,6 +266,11 @@ def get_policy(**kwargs):
def resetswift(): def resetswift():
p = Popen("resetswift 2>&1", shell=True, stdout=PIPE) p = Popen("resetswift 2>&1", shell=True, stdout=PIPE)
stdout, _stderr = p.communicate() stdout, _stderr = p.communicate()
if p.returncode:
raise AssertionError(
'Cleanup with "resetswift" failed: stdout: %s, stderr: %s'
% (stdout, _stderr))
print(stdout) print(stdout)
Manager(['all']).stop() Manager(['all']).stop()