Merge "Funnel debug logging through nose properly."

glance/tests/__init__.py

@@ -20,10 +20,12 @@
 import __builtin__
 setattr(__builtin__, '_', lambda x: x)
 
-# Set up logging to output debugging
 import logging
+import sys
+
+# Set up logging to output debugging
 logger = logging.getLogger()
-hdlr = logging.FileHandler('run_tests.log', 'w')
+hdlr = logging.StreamHandler(sys.stdout)
 formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
 hdlr.setFormatter(formatter)
 logger.addHandler(hdlr)

tox.ini

@@ -8,7 +8,6 @@ setenv = VIRTUAL_ENV={envdir}
          NOSE_OPENSTACK_RED=0.05
          NOSE_OPENSTACK_YELLOW=0.025
          NOSE_OPENSTACK_SHOW_ELAPSED=1
-         NOSE_OPENSTACK_STDOUT=1
 deps = -r{toxinidir}/tools/pip-requires
        -r{toxinidir}/tools/test-requires
 commands = nosetests {posargs}