Cleans up the output of run_tests.sh to look closer to Trial.

Example output:

VolumeTestCase
    test_concurrent_volumes_get_different_targets               ok
    test_create_delete_volume                                   ok
    test_multi_node                                             ok
    test_run_attach_detach_volume                               ok
    test_too_big_volume                                         ok
    test_too_many_volumes                                       ok
XenAPIVMTestCase
    test_list_instances_0                                       ok
    test_spawn                                                  ok
XenAPIVolumeTestCase
    test_attach_volume                                          ok
    test_attach_volume_raise_exception                          ok
    test_create_iscsi_storage                                   ok
    test_parse_volume_info_raise_exception                      ok

----------------------------------------------------------------------
Ran 232 tests in 82.677s

Launchpad is removing a bunch of spaces from the output, but the 'ok' parts are all lined up in the 65th column

2 files changed, 74 insertions, 5 deletions

diff --git a/run_tests.py b/run_tests.py
new file mode 100644
index 000000000..5b8617f63
--- /dev/null
+++ b/run_tests.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 United States Government as represented by the
+# Administrator of the National Aeronautics and Space Administration.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+
+
+import os
+import unittest
+import sys
+
+from nose import config
+from nose import result
+from nose import core
+
+
+class NovaTestResult(result.TextTestResult):
+    def __init__(self, *args, **kw):
+        result.TextTestResult.__init__(self, *args, **kw)
+        self._last_case = None
+
+    def getDescription(self, test):
+        return str(test)
+
+    def startTest(self, test):
+        unittest.TestResult.startTest(self, test)
+        current_case = test.test.__class__.__name__
+
+        if self.showAll:
+            if current_case != self._last_case:
+                self.stream.writeln(current_case)
+                self._last_case = current_case
+
+            self.stream.write(
+                '    %s' % str(test.test._testMethodName).ljust(60))
+            self.stream.flush()
+
+
+class NovaTestRunner(core.TextTestRunner):
+    def _makeResult(self):
+        return NovaTestResult(self.stream,
+                              self.descriptions,
+                              self.verbosity,
+                              self.config)
+
+
+if __name__ == '__main__':
+    c = config.Config(stream=sys.stdout,
+                      env=os.environ,
+                      verbosity=3)
+
+    runner = NovaTestRunner(stream=c.stream,
+                            verbosity=c.verbosity,
+                            config=c)
+    sys.exit(not core.run(config=c, testRunner=runner))
diff --git a/run_tests.sh b/run_tests.sh
index ffb0b6295..fe703fece 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -32,16 +32,17 @@ never_venv=0
 force=0
 noseargs=
 
+
 for arg in "$@"; do
   process_option $arg
 done
 
-NOSETESTS="nosetests -v $noseargs"
+NOSETESTS="python run_tests.py $noseargs"
 
 if [ $never_venv -eq 1 ]; then
   # Just run the test suites in current environment
   rm -f nova.sqlite
-  $NOSETESTS
+  $NOSETESTS 2> run_tests.err.log
   exit
 fi
 
@@ -53,7 +54,7 @@ fi
 
 if [ -e ${venv} ]; then
   ${with_venv} rm -f nova.sqlite
-  ${with_venv} $NOSETESTS
+  ${with_venv} $NOSETESTS 2> run_tests.err.log
 else  
   if [ $always_venv -eq 1 ]; then
     # Automatically install the virtualenv
@@ -66,10 +67,10 @@ else
       python tools/install_venv.py
     else
       rm -f nova.sqlite
-      $NOSETESTS
+      $NOSETESTS 2> run_tests.err.log
       exit
     fi
   fi
   ${with_venv} rm -f nova.sqlite
-  ${with_venv} $NOSETESTS
+  ${with_venv} $NOSETESTS 2> run_tests.err.log
 fi