commit f756d3a5281dad98d5e22e459bfb5ff3f745822f
author Jenkins <jenkins@review.openstack.org> Sat Dec 07 13:31:55 2013 +0000
committer Gerrit Code Review <review@openstack.org> Sat Dec 07 13:31:55 2013 +0000
tree 6dac82fc12951f6fa19e38be88b125adec0bed0f
parent 68929b87231c16acbdc78b721104caf8fb87c5a5
parent 211ca96196b336fa7fda1e714d2c8c487ac16d2b

Merge "Move import to import block again"

tempest/stress/run_stress.py

diff --git a/tempest/stress/run_stress.py b/tempest/stress/run_stress.py
index e5cc281..067b994 100755
--- a/tempest/stress/run_stress.py
+++ b/tempest/stress/run_stress.py
@@ -24,6 +24,7 @@
 from unittest import loader
 
 from tempest.openstack.common import log as logging
+from tempest.stress import driver
 
 LOG = logging.getLogger(__name__)
 
@@ -68,8 +69,6 @@
 
 
 def main(ns):
-    # NOTE(mkoderer): moved import to make "-h" possible without OpenStack
-    from tempest.stress import driver
     result = 0
     if not ns.all:
         tests = json.load(open(ns.tests, 'r'))