From 035265540ad9619b4427c6a650d4d7664e5c206d Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 27 Oct 2009 23:00:28 +0000 Subject: [PATCH] Merged revisions 75887 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r75887 | georg.brandl | 2009-10-27 23:56:09 +0100 (Di, 27 Okt 2009) | 1 line Make sure every run of test_intern() interns a new string, otherwise that test fails e.g. when some other test in test_builtin fails and it is rerun in verbose mode. ........ --- Lib/test/test_sys.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index 599f09be35f..d2978702b63 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -5,6 +5,11 @@ import struct import subprocess import textwrap +# count the number of test runs, used to create unique +# strings to intern in test_intern() +numruns = 0 + + class SysModuleTest(unittest.TestCase): def setUp(self): @@ -383,8 +388,10 @@ class SysModuleTest(unittest.TestCase): self.assertEqual(sys.__stdout__.encoding, sys.__stderr__.encoding) def test_intern(self): + global numruns + numruns += 1 self.assertRaises(TypeError, sys.intern) - s = "never interned before" + s = "never interned before" + str(numruns) self.assertTrue(sys.intern(s) is s) s2 = s.swapcase().swapcase() self.assertTrue(sys.intern(s2) is s)