diff options
| author | Josh Kearney <josh@jk0.org> | 2011-06-28 17:05:41 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-06-28 17:05:41 -0500 |
| commit | d59e576dfeccdbd7ee82ea2803b57e24dcba2c22 (patch) | |
| tree | ea8c17a46c7fe9f354e48aa6b9aa754586d13875 /run_tests.py | |
| parent | d0ff8a737111e9155fd59816afa5c4fc2b34bb4c (diff) | |
| parent | 9ae4fbdef0a5f4c925c7e3d546edea06e608e39b (diff) | |
| download | nova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.tar.gz nova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.tar.xz nova-d59e576dfeccdbd7ee82ea2803b57e24dcba2c22.zip | |
Merged trunk
Diffstat (limited to 'run_tests.py')
| -rw-r--r-- | run_tests.py | 7 |
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) |