commit 9f88073c0fcd61be350f92227eb33b71957ec5d5
author Jenkins <jenkins@review.openstack.org> Mon Feb 24 09:06:37 2014 +0000
committer Gerrit Code Review <review@openstack.org> Mon Feb 24 09:06:37 2014 +0000
tree ac8bd97fd049f16f34144a0d807246a894711b4a
parent 89f2256c03b7f97ee51274b46ab7741d11e4b2cb
parent f2a8bbddb91631b789494ead091f25ad5c5e09db

Merge "Fix stress runner exit issues"

tempest/stress/run_stress.py

diff --git a/tempest/stress/run_stress.py b/tempest/stress/run_stress.py
index 76320d0..a6c2b77 100755
--- a/tempest/stress/run_stress.py
+++ b/tempest/stress/run_stress.py
@@ -87,8 +87,13 @@
             # 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