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.
........

diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 910658dea3d535d7c8ab543c361e8a8bc5e0d2c4..d8e604158c7bcab9878bf8178bf2a6c8e8f919ff 100644 (file)
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -13,6 +13,7 @@ warnings.filterwarnings("ignore", "integer argument expected",
 
 # count the number of test runs.
 # used to skip running test_execfile() multiple times
+# and to create unique strings to intern in test_intern()
 numruns = 0
 
 class Squares:
@@ -646,7 +647,9 @@ class BuiltinTest(unittest.TestCase):
 
     def test_intern(self):
         self.assertRaises(TypeError, intern)
-        s = "never interned before"
+        # This fails if the test is run twice with a constant string,
+        # therefore append the run counter
+        s = "never interned before " + str(numruns)
         self.assert_(intern(s) is s)
         s2 = s.swapcase().swapcase()
         self.assert_(intern(s2) is s)