From 046467cf9a5c0a5699d5a11381470076ae2a1c3d Mon Sep 17 00:00:00 2001 From: Antoine Pitrou Date: Fri, 30 Oct 2009 18:30:35 +0000 Subject: [PATCH] Followup to r75965: replace the test_uuid-specific patch with a generic fix (other tests may have the same problem). --- Lib/test/regrtest.py | 6 ++++++ Lib/test/test_uuid.py | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index 2b8a6a7a940..75a74fa50f2 100755 --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -996,6 +996,12 @@ def dash_R_cleanup(fs, ps, pic, abcs): obj._abc_cache.clear() obj._abc_negative_cache.clear() + # Flush standard output, so that buffered data is sent to the OS and + # associated Python objects are reclaimed. + for stream in (sys.stdout, sys.stderr, sys.__stdout__, sys.__stderr__): + if stream is not None: + stream.flush() + # Clear assorted module caches. _path_created.clear() re.purge() diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py index b4dd459720d..b749abce39d 100644 --- a/Lib/test/test_uuid.py +++ b/Lib/test/test_uuid.py @@ -314,7 +314,6 @@ class TestUUID(TestCase): import sys print(""" WARNING: uuid._ifconfig_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly.""", file=sys.__stdout__) - sys.__stdout__.flush() return import os @@ -343,7 +342,6 @@ class TestUUID(TestCase): import sys print(""" WARNING: uuid._unixdll_getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly.""", file=sys.__stdout__) - sys.__stdout__.flush() return import os @@ -359,7 +357,6 @@ class TestUUID(TestCase): import sys print(""" WARNING: uuid.getnode is unreliable on many platforms. It is disabled until the code and/or test can be fixed properly.""", file=sys.__stdout__) - sys.__stdout__.flush() return node1 = uuid.getnode()