summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorin Hochstein <lorin@isi.edu>2011-06-17 20:36:10 +0000
committerTarmac <>2011-06-17 20:36:10 +0000
commit33434e33f8f2e8fd809554cefeb3293efb372141 (patch)
tree9b28f347d61b0070b44b12ac862f5a88a370d662
parente17d8a9bb34ff253d40ca7abb81b50944a5dcfca (diff)
parent64942d92f3f2b204f55225ab1372507edf543089 (diff)
downloadnova-33434e33f8f2e8fd809554cefeb3293efb372141.tar.gz
nova-33434e33f8f2e8fd809554cefeb3293efb372141.tar.xz
nova-33434e33f8f2e8fd809554cefeb3293efb372141.zip
Fixes a bug where a misleading error message is outputted when there's a sqlalchemy-migrate version conflict.
-rw-r--r--run_tests.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/run_tests.py b/run_tests.py
index 0944bb585..bb33f9139 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -211,6 +211,12 @@ 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,
+ # _handleElapsedTime will fail, causing the wrong error message to
+ # be outputted.
+ self.start_time = time.time()
+
def getDescription(self, test):
return str(test)