From 64942d92f3f2b204f55225ab1372507edf543089 Mon Sep 17 00:00:00 2001
From: Lorin Hochstein <lorin@isi.edu>
Date: Fri, 17 Jun 2011 10:17:07 -0400
Subject: Fix for a problem where run_tests.sh would output a seemingly
 unrelated error message when there was a sqlalchemy-migrate version number
 conflict

---
 run_tests.py | 6 ++++++
 1 file changed, 6 insertions(+)

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)
 
-- 
cgit