Merge lp:~usc-isi/nova/lp798714 into lp:~hudson-openstack/nova/trunk

[Lorin Hochstein]

Fixes a bug where a misleading error message is outputted when there's a sqlalchemy-migrate version conflict.

[Josh Kearney (jk0)]

This is a great fix, but the merge prop. will need a Commit Message or Description to succeed in merging.

review: Needs Fixing

[Lorin Hochstein (lorinh)]

> This is a great fix, but the merge prop. will need a Commit Message or
> Description to succeed in merging.

Commit message added.

[Josh Kearney (jk0)]

Thanks :)

review: Approve

[Matt Dietz (cerberus)]

Awesome

review: Approve

=== modified file 'run_tests.py'
--- run_tests.py	2011-06-15 04:05:37 +0000
+++ run_tests.py	2011-06-17 14:20:33 +0000
@@ -211,6 +211,12 @@
                 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)