summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-07-14 12:18:57 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-07-14 12:18:57 (GMT)
commit7ebb7061339f242b9ffd9fd8a7ad1f172d341666 (patch)
treec7372f3e65ba389c1c764c257873295c276cb7bd /Lib
parent6e18e04273877e04da0c9516d9c016e650bc72ec (diff)
downloadcpython-7ebb7061339f242b9ffd9fd8a7ad1f172d341666.zip
cpython-7ebb7061339f242b9ffd9fd8a7ad1f172d341666.tar.gz
cpython-7ebb7061339f242b9ffd9fd8a7ad1f172d341666.tar.bz2
Restore the global state of the log vars, so that test_cgi can be run twice without failures.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_cgi.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/Lib/test/test_cgi.py b/Lib/test/test_cgi.py
index d745199..c42db4e 100644
--- a/Lib/test/test_cgi.py
+++ b/Lib/test/test_cgi.py
@@ -155,7 +155,13 @@ class CgiTests(unittest.TestCase):
cgi.logfp = None
cgi.logfile = "/dev/null"
cgi.initlog("%s", "Testing log 3")
- self.addCleanup(cgi.logfp.close)
+ def log_cleanup():
+ """Restore the global state of the log vars."""
+ cgi.logfile = ''
+ cgi.logfp.close()
+ cgi.logfp = None
+ cgi.log = cgi.initlog
+ self.addCleanup(log_cleanup)
cgi.log("Testing log 4")
def test_fieldstorage_readline(self):