merged upstream

4 files changed, 11 insertions, 9 deletions

diff --git a/nova/test.py b/nova/test.py
index 9c961a987..d8a47464f 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -30,6 +30,7 @@ import uuid
 import unittest
 
 import mox
+import shutil
 import stubout
 
 from nova import context
diff --git a/nova/tests/fake_flags.py b/nova/tests/fake_flags.py
index dcc8a676d..cbd949477 100644
--- a/nova/tests/fake_flags.py
+++ b/nova/tests/fake_flags.py
@@ -41,4 +41,3 @@ FLAGS.iscsi_num_targets = 8
 FLAGS.verbose = True
 FLAGS.sqlite_db = "tests.sqlite"
 FLAGS.use_ipv6 = True
-FLAGS.logfile = 'tests.log'
diff --git a/run_tests.py b/run_tests.py
index 88c42bd31..bb6f0dd1e 100644
--- a/run_tests.py
+++ b/run_tests.py
@@ -86,7 +86,7 @@ class _AnsiColorizer(object):
                 try:
                     return curses.tigetnum("colors") > 2
                 except curses.error:
-                    curses.setupterm(fd=stream.fileno())
+                    curses.setupterm()
                     return curses.tigetnum("colors") > 2
             except:
                 raise
@@ -111,13 +111,13 @@ class _Win32Colorizer(object):
     See _AnsiColorizer docstring.
     """
     def __init__(self, stream):
-        from win32console import GetStdHandle, STD_ERROR_HANDLE, \
+        from win32console import GetStdHandle, STD_OUT_HANDLE, \
              FOREGROUND_RED, FOREGROUND_BLUE, FOREGROUND_GREEN, \
              FOREGROUND_INTENSITY
         red, green, blue, bold = (FOREGROUND_RED, FOREGROUND_GREEN,
                                   FOREGROUND_BLUE, FOREGROUND_INTENSITY)
         self.stream = stream
-        self.screenBuffer = GetStdHandle(STD_ERROR_HANDLE)
+        self.screenBuffer = GetStdHandle(STD_OUT_HANDLE)
         self._colors = {
             'normal': red | green | blue,
             'red': red | bold,
@@ -133,7 +133,7 @@ class _Win32Colorizer(object):
         try:
             import win32console
             screenBuffer = win32console.GetStdHandle(
-                win32console.STD_ERROR_HANDLE)
+                win32console.STD_OUT_HANDLE)
         except ImportError:
             return False
         import pywintypes
@@ -174,12 +174,14 @@ class NovaTestResult(result.TextTestResult):
         result.TextTestResult.__init__(self, *args, **kw)
         self._last_case = None
         self.colorizer = None
+        # NOTE(vish): reset stdout for the terminal check
+        stdout = sys.stdout
+        sys.stdout = sys.__stdout__
         for colorizer in [_Win32Colorizer, _AnsiColorizer, _NullColorizer]:
-            # NOTE(vish): nose does funky stuff with stdout, so use stderr
-            #             to setup the colorizer
-            if colorizer.supported(sys.stderr):
+            if colorizer.supported():
                 self.colorizer = colorizer(self.stream)
                 break
+        sys.stdout = stdout
 
     def getDescription(self, test):
         return str(test)
diff --git a/run_tests.sh b/run_tests.sh
index 6c346d52d..a93e19658 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -39,7 +39,7 @@ done
 
 function run_tests {
   # Just run the test suites in current environment
-  ${wrapper} $NOSETESTS
+  ${wrapper} $NOSETESTS 2> run_tests.log
 }
 
 NOSETESTS="python run_tests.py $noseargs"