openstack/swift
Code Issues Proposed changes

cleaned up test reloads

Browse Source
This commit is contained in:
Clay Gerrard 2010-11-17 17:17:05 -06:00
parent adb52e7cc0
commit d583fd9bdb
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/unit/common/test_utils.py
View File

@ -176,16 +176,7 @@ class TestUtils(unittest.TestCase):
self.assertEquals(sio.getvalue(), '')
def test_LoggerFileObject(self):
if isinstance(sys.stdout, utils.LoggerFileObject):
# This may happen if some other not so nice test allowed stdout to
# be caputred by daemonize w/o cleaning up after itself (i.e.
# test_db_replicator.TestDBReplicator.test_run_once). Normally
# nose would clean this up for us (which works well and is
# probably the best solution). But when running with --nocapture,
# this condition would cause the first print to acctually be
# redirected to a log call and the test would fail - so we have to
# go old school
sys.stdout = sys.__stdout__
reload(sys) # reset stdio redirection
orig_stdout = sys.stdout
orig_stderr = sys.stderr
sio = StringIO()
@ -439,6 +430,9 @@ log_name = yarr'''
self.assertFalse(hasattr(utils.sys, 'stdout'))
self.assertFalse(hasattr(utils.sys, 'stderr'))
# reset mocks on utils
reload(utils)
def test_get_logger_console(self):
reload(utils) # reset get_logger attrs
logger = utils.get_logger(None)