[Python-checkins] r78067 - in python/branches/release26-maint/Lib/test: test_richcmp.py test_tempfile.py
georg.brandl
python-checkins at python.org
Sun Feb 7 12:54:01 CET 2010
Author: georg.brandl
Date: Sun Feb 7 12:54:01 2010
New Revision: 78067
Log:
Manual backport of r78046.
Modified:
python/branches/release26-maint/Lib/test/test_richcmp.py
python/branches/release26-maint/Lib/test/test_tempfile.py
Modified: python/branches/release26-maint/Lib/test/test_richcmp.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_richcmp.py (original)
+++ python/branches/release26-maint/Lib/test/test_richcmp.py Sun Feb 7 12:54:01 2010
@@ -195,9 +195,9 @@
def __lt__(self, other): return 0
def __gt__(self, other): return 0
def __eq__(self, other): return 0
- def __le__(self, other): raise TestFailed, "This shouldn't happen"
- def __ge__(self, other): raise TestFailed, "This shouldn't happen"
- def __ne__(self, other): raise TestFailed, "This shouldn't happen"
+ def __le__(self, other): raise test_support.TestFailed, "This shouldn't happen"
+ def __ge__(self, other): raise test_support.TestFailed, "This shouldn't happen"
+ def __ne__(self, other): raise test_support.TestFailed, "This shouldn't happen"
def __cmp__(self, other): raise RuntimeError, "expected"
a = Misb()
b = Misb()
Modified: python/branches/release26-maint/Lib/test/test_tempfile.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_tempfile.py (original)
+++ python/branches/release26-maint/Lib/test/test_tempfile.py Sun Feb 7 12:54:01 2010
@@ -127,7 +127,7 @@
if i == 20:
break
except:
- failOnException("iteration")
+ self.failOnException("iteration")
test_classes.append(test__RandomNameSequence)
More information about the Python-checkins
mailing list