test_util.py: fix problems

This commit is contained in:
Brian Warner 2007-04-06 16:36:22 -07:00
parent d432099880
commit e74e370d00
1 changed files with 6 additions and 4 deletions

View File

@ -28,19 +28,21 @@ class NoArgumentException(Exception):
class HumanReadable(unittest.TestCase): class HumanReadable(unittest.TestCase):
def test_repr(self): def test_repr(self):
hr = humanreadable.hr hr = humanreadable.hr
self.failUnlessEqual(hr(foo), "<foo() at test_utils.py:2>") self.failUnlessEqual(hr(foo), "<foo() at test_util.py:2>")
self.failUnlessEqual(hr(self.test_repr), self.failUnlessEqual(hr(self.test_repr),
"<bound method HumanReadable.test_repr of <allmydata.test.test_utils.HumanReadable testMethod=test_repr>>") "<bound method HumanReadable.test_repr of <allmydata.test.test_util.HumanReadable testMethod=test_repr>>")
self.failUnlessEqual(hr(1L), "1") self.failUnlessEqual(hr(1L), "1")
self.failUnlessEqual(hr(10**40), self.failUnlessEqual(hr(10**40),
"100000000000000000...000000000000000000") "100000000000000000...000000000000000000")
self.failUnlessEqual(hr(self), "<allmydata.test.test_utils.HumanReadable testMethod=test_repr>") self.failUnlessEqual(hr(self), "<allmydata.test.test_util.HumanReadable testMethod=test_repr>")
self.failUnlessEqual(hr([1,2]), "[1, 2]") self.failUnlessEqual(hr([1,2]), "[1, 2]")
self.failUnlessEqual(hr({1:2}), "{1:2}") self.failUnlessEqual(hr({1:2}), "{1:2}")
try: try:
raise RuntimeError raise RuntimeError
except Exception, e: except Exception, e:
self.failUnlessEqual(hr(e), "<RuntimeError: ()>") self.failUnless(
hr(e) == "<RuntimeError: ()>" # python-2.4
or hr(e) == "RuntimeError()") # python-2.5
try: try:
raise RuntimeError("oops") raise RuntimeError("oops")
except Exception, e: except Exception, e: