From f07a4db6cdca28f58b795b3fcea2877e595867a7 Mon Sep 17 00:00:00 2001 From: Mark Washenberger Date: Wed, 20 Jun 2012 15:24:17 +0000 Subject: [PATCH] Revert "Funnel debug logging through nose properly." This fixes bug 1015613 This reverts commit 95fb6e5f8988079d7dffe3a039f1ebd697199eb8. Change-Id: I827475c86d6f9166c0ee3ba9b0cc9a0a5105c049 --- glance/tests/__init__.py | 6 ++---- tox.ini | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/glance/tests/__init__.py b/glance/tests/__init__.py index 337800f4..9422f7b8 100644 --- a/glance/tests/__init__.py +++ b/glance/tests/__init__.py @@ -20,12 +20,10 @@ import __builtin__ setattr(__builtin__, '_', lambda x: x) -import logging -import sys - # Set up logging to output debugging +import logging logger = logging.getLogger() -hdlr = logging.StreamHandler(sys.stdout) +hdlr = logging.FileHandler('run_tests.log', 'w') formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s') hdlr.setFormatter(formatter) logger.addHandler(hdlr) diff --git a/tox.ini b/tox.ini index b9b74180..1b0768da 100644 --- a/tox.ini +++ b/tox.ini @@ -8,6 +8,7 @@ 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}