4b97eebe22
- 2.7.1, reworking patch 0 (config), patch 102 (lib64); drop upstream patch 56 (cfgparse), patch 110 (ctypes/SELinux/noexecmem), patch 119 (expat compat), patch 123 (2to3 on "from itertools import *") - fix test_abc's test_cache_leak in the debug build (patch 128) - drop _weakref.so from manifest (_weakref became a core module in r84230)
28 lines
931 B
Diff
28 lines
931 B
Diff
diff -up Python-2.7.1/Lib/test/test_abc.py.cache_leak Python-2.7.1/Lib/test/test_abc.py
|
|
--- Python-2.7.1/Lib/test/test_abc.py.cache_leak 2010-12-28 18:06:35.551938356 -0500
|
|
+++ Python-2.7.1/Lib/test/test_abc.py 2010-12-28 18:09:09.021059202 -0500
|
|
@@ -3,6 +3,8 @@
|
|
|
|
"""Unit tests for abc.py."""
|
|
|
|
+import sys
|
|
+
|
|
import unittest, weakref
|
|
from test import test_support
|
|
|
|
@@ -229,8 +231,12 @@ class TestABC(unittest.TestCase):
|
|
# Trigger cache.
|
|
C().f()
|
|
del C
|
|
- test_support.gc_collect()
|
|
- self.assertEqual(r(), None)
|
|
+ # This doesn't work in our debug build, presumably due to its use
|
|
+ # of COUNT_ALLOCS, which makes heap-allocated types immortal (once
|
|
+ # they've ever had an instance):
|
|
+ if not hasattr(sys, 'getcounts'):
|
|
+ test_support.gc_collect()
|
|
+ self.assertEqual(r(), None)
|
|
|
|
def test_main():
|
|
test_support.run_unittest(TestABC)
|