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.
........
This commit is contained in:
Georg Brandl 2009-10-27 22:57:25 +00:00
parent a8507d59db
commit 23016276b6
1 changed files with 4 additions and 1 deletions

View File

@ -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)