Merge "Fix stress runner exit issues"

2014-02-24 09:06:37 +00:00 · 2014-02-24 09:06:37 +00:00 · 9f88073c0f
commit 9f88073c0f
parent 89f2256c03 f2a8bbddb9
1 changed files with 6 additions and 1 deletions
--- a/tempest/stress/run_stress.py
+++ b/tempest/stress/run_stress.py
@ -87,8 +87,13 @@ def main(ns):
            # NOTE(mkoderer): we just save the last result code
            if (step_result != 0):
                result = step_result
+                if ns.stop:
+                    return result
    else:
-        driver.stress_openstack(tests, ns.duration, ns.number, ns.stop)
+        result = driver.stress_openstack(tests,
+                                         ns.duration,
+                                         ns.number,
+                                         ns.stop)
    return result