Mercurial > cpython-lru_cache-weakref
changeset 56918:7e66ffdbcbef 2.6
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.
........
| author | Georg Brandl <georg@python.org> |
|---|---|
| date | Tue, 27 Oct 2009 22:57:25 +0000 |
| parents | 44f64472e922 |
| children | 64ad36507944 |
| files | Lib/test/test_builtin.py |
| diffstat | 1 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/Lib/test/test_builtin.py Tue Oct 27 22:09:55 2009 +0000 +++ b/Lib/test/test_builtin.py Tue Oct 27 22:57:25 2009 +0000 @@ -13,6 +13,7 @@ # 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 @@ 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)