Merge with trunk

1 files changed, 3 insertions, 4 deletions

diff --git a/run_tests.py b/run_tests.py
index bb33f9139..fd836967e 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -69,7 +69,6 @@ from nose import core
 from nose import result
 
 from nova import log as logging
-from nova.tests import fake_flags
 
 
 class _AnsiColorizer(object):
@@ -211,11 +210,11 @@ class NovaTestResult(result.TextTestResult):
                 break
         sys.stdout = stdout
 
-        # NOTE(lorinh): Initialize start_time in case a sqlalchemy-migrate 
-        # error results in it failing to be initialized later. Otherwise, 
+        # NOTE(lorinh): Initialize start_time in case a sqlalchemy-migrate
+        # error results in it failing to be initialized later. Otherwise,
         # _handleElapsedTime will fail, causing the wrong error message to
         # be outputted.
-        self.start_time = time.time() 
+        self.start_time = time.time()
 
     def getDescription(self, test):
         return str(test)