From d160455b77d7e180f252f4b412e3f65d7286b51f Mon Sep 17 00:00:00 2001
From: termie <github@anarkystic.com>
Date: Wed, 23 Feb 2011 08:45:27 -0800
Subject: [PATCH 1/2] allow users to omit 'nova.tests' with run_tests

---
 run_tests.py | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/run_tests.py b/run_tests.py
index 6d96454b9de..47e3ee31764 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -17,6 +17,23 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
+"""Unittest runner for Nova.
+
+To run all tests
+    python run_tests.py
+
+To run a single test:
+    python run_tests.py test_compute:ComputeTestCase.test_run_terminate
+
+To run a single test module:
+    python run_tests.py test_compute
+
+    or
+
+    python run_tests.py api.test_wsgi
+
+"""
+
 import gettext
 import os
 import unittest
@@ -62,6 +79,15 @@ def _makeResult(self):
 
 if __name__ == '__main__':
     logging.setup()
+    # If any argument looks like a test name but doesn't have "nova.tests" in
+    # front of it, automatically add that so we don't have to type as much
+    argv = []
+    for x in sys.argv:
+        if x.startswith('test_'):
+            argv.append('nova.tests.%s' % x)
+        else:
+            argv.append(x)
+
     c = config.Config(stream=sys.stdout,
                       env=os.environ,
                       verbosity=3,
@@ -70,4 +96,4 @@ def _makeResult(self):
     runner = NovaTestRunner(stream=c.stream,
                             verbosity=c.verbosity,
                             config=c)
-    sys.exit(not core.run(config=c, testRunner=runner))
+    sys.exit(not core.run(config=c, testRunner=runner, argv=argv))

From 2bbbfc5af62db57158a8d6aa26912ba234d0296e Mon Sep 17 00:00:00 2001
From: termie <github@anarkystic.com>
Date: Wed, 23 Feb 2011 08:46:11 -0800
Subject: [PATCH 2/2] dump error output directly on short import errors

---
 run_tests.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/run_tests.sh b/run_tests.sh
index 70212cc6a91..4e8159e7bdb 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -40,7 +40,18 @@ done
 function run_tests {
   # Just run the test suites in current environment
   ${wrapper} rm -f nova.sqlite
-  ${wrapper} $NOSETESTS
+  ${wrapper} $NOSETESTS 2> run_tests.err.log
+  # If we get some short import error right away, print the error log directly
+  RESULT=$?
+  if [ "$RESULT" -ne "0" ];
+  then
+    ERRSIZE=`wc -l run_tests.err.log | awk '{print \$1}'`
+    if [ "$ERRSIZE" -lt "40" ];
+    then
+      cat run_tests.err.log
+    fi
+  fi
+  return $RESULT
 }
 
 NOSETESTS="python run_tests.py $noseargs"