mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-14 15:56:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge more test vs hashing-order fixes from 3.2.

Browse source
This commit is contained in:
Georg Brandl 2012-02-21 00:34:05 +01:00
commit 802505d05e
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Lib/test/test_inspect.py
View file

@ -810,7 +810,8 @@ class TestGetcallargsFunctions(unittest.TestCase):
self.assertEqualException(f, '2, 3, 4') self.assertEqualException(f, '2, 3, 4')
self.assertEqualException(f, '1, 2, 3, a=1') self.assertEqualException(f, '1, 2, 3, a=1')
self.assertEqualException(f, '2, 3, 4, c=5') self.assertEqualException(f, '2, 3, 4, c=5')
self.assertEqualException(f, '2, 3, 4, a=1, c=5') # XXX: success of this one depends on dict order
## self.assertEqualException(f, '2, 3, 4, a=1, c=5')
# f got an unexpected keyword argument # f got an unexpected keyword argument
self.assertEqualException(f, 'c=2') self.assertEqualException(f, 'c=2')
self.assertEqualException(f, '2, c=3') self.assertEqualException(f, '2, c=3')

1
Lib/test/test_weakset.py
View file

@ -335,6 +335,7 @@ class TestWeakSet(unittest.TestCase):
try: try:
it = iter(s) it = iter(s)
next(it) next(it)
del it
# Schedule an item for removal and recreate it # Schedule an item for removal and recreate it
u = ustr(str(items.pop())) u = ustr(str(items.pop()))
gc.collect() # just in case gc.collect() # just in case