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

2016-08-18 04:54:18 +00:00 · 2016-08-18 04:54:18 +00:00 · 72c3163be8
commit 72c3163be8
parent 0c9620be0d 95a5a4a7ec
1 changed files with 5 additions and 0 deletions
--- a/test/probe/common.py
+++ b/test/probe/common.py
@ -266,6 +266,11 @@ def get_policy(**kwargs):
 def resetswift():
    p = Popen("resetswift 2>&1", shell=True, stdout=PIPE)
    stdout, _stderr = p.communicate()
+    if p.returncode:
+        raise AssertionError(
+            'Cleanup with "resetswift" failed: stdout: %s, stderr: %s'
+            % (stdout, _stderr))
+
    print(stdout)
    Manager(['all']).stop()