commit 652063a99cb161ed69e0ac6590614a6218c5716f
author Jenkins <jenkins@review.openstack.org> Sat Oct 25 08:53:22 2014 +0000
committer Gerrit Code Review <review@openstack.org> Sat Oct 25 08:53:22 2014 +0000
tree cd3ba41f69f76a70cd71cff95f34b9156b169a4d
parent c036c508531677a8729acc7fd8b7db95d774c986
parent 884e2f391623c9ecc1b058f268f5d1ffc26d2d23

Merge "Fix AttributeError when test_function_help fails"

tempest/tests/stress/test_stress.py

diff --git a/tempest/tests/stress/test_stress.py b/tempest/tests/stress/test_stress.py
index 3dc2199..5a93472 100644
--- a/tempest/tests/stress/test_stress.py
+++ b/tempest/tests/stress/test_stress.py
@@ -16,7 +16,7 @@
 import shlex
 import subprocess
 
-import tempest.cli as cli
+import tempest.exceptions as exceptions
 from tempest.openstack.common import log as logging
 from tempest.tests import base
 
@@ -43,9 +43,9 @@
             result, result_err = proc.communicate()
             if proc.returncode != 0:
                 LOG.debug('error of %s:\n%s' % (cmd_str, result_err))
-                raise cli.CommandFailed(proc.returncode,
-                                        cmd,
-                                        result)
+                raise exceptions.CommandFailed(proc.returncode,
+                                               cmd,
+                                               result)
         finally:
             LOG.debug('output of %s:\n%s' % (cmd_str, result))
         return proc.returncode