ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 07:06:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_cli/test_web: fix spurious test failure on solaris (maybe python2.4?) due to variations in the way that exceptions are stringified

Browse Source
This commit is contained in:
Brian Warner 2009-02-25 00:01:28 -07:00
parent a3c1fe35d9
commit 7d4901197a
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/allmydata/test/test_cli.py
View File

@ -1348,7 +1348,8 @@ class Check(GridTestMixin, CLITestMixin, unittest.TestCase):
d.addCallback(lambda ign: self.do_cli("manifest", self.rooturi))
def _manifest_failed((rc, out, err)):
self.failIfEqual(rc, 0)
self.failUnlessIn("ERROR: UnrecoverableFileError", err)
self.failUnlessIn("ERROR: ", err)
self.failUnlessIn("UnrecoverableFileError", err)
# the fatal directory should still show up, as the last line
self.failUnlessIn(" subdir\n", out)
d.addCallback(_manifest_failed)
@ -1356,7 +1357,8 @@ class Check(GridTestMixin, CLITestMixin, unittest.TestCase):
d.addCallback(lambda ign: self.do_cli("deep-check", self.rooturi))
def _deep_check_failed((rc, out, err)):
self.failIfEqual(rc, 0)
self.failUnlessIn("ERROR: UnrecoverableFileError", err)
self.failUnlessIn("ERROR: ", err)
self.failUnlessIn("UnrecoverableFileError", err)
# we want to make sure that the error indication is the last
# thing that gets emitted
self.failIf("done:" in out, out)
@ -1372,7 +1374,8 @@ class Check(GridTestMixin, CLITestMixin, unittest.TestCase):
#def _deep_check_repair_failed((rc, out, err)):
# self.failIfEqual(rc, 0)
# print err
# self.failUnlessIn("ERROR: UnrecoverableFileError", err)
# self.failUnlessIn("ERROR: ", err)
# self.failUnlessIn("UnrecoverableFileError", err)
# self.failIf("done:" in out, out)
#d.addCallback(_deep_check_repair_failed)

10
src/allmydata/test/test_web.py
View File

@ -2883,7 +2883,12 @@ class Grid(GridTestMixin, WebErrorMixin, unittest.TestCase, ShouldFailMixin):
error_line = lines[first_error]
error_msg = lines[first_error+1:]
error_msg_s = "\n".join(error_msg) + "\n"
self.failUnlessIn("ERROR: UnrecoverableFileError", error_line)
# different pythons repr the exception differently, so sometimes
# we get "ERROR: UnrecoverableFileError", and sometimes we get
# "ERROR: <allmydata.mutable.common.UnrecoverableFileError
# instance at 0x...>".
self.failUnlessIn("ERROR: ", error_line)
self.failUnlessIn("UnrecoverableFileError", error_line)
self.failUnlessIn("no recoverable versions", error_line)
self.failUnless(len(error_msg) > 2, error_msg_s) # some traceback
units = [simplejson.loads(line) for line in lines[:first_error]]
@ -2904,7 +2909,8 @@ class Grid(GridTestMixin, WebErrorMixin, unittest.TestCase, ShouldFailMixin):
error_line = lines[first_error]
error_msg = lines[first_error+1:]
error_msg_s = "\n".join(error_msg) + "\n"
self.failUnlessIn("ERROR: UnrecoverableFileError", error_line)
self.failUnlessIn("ERROR: ", error_line)
self.failUnlessIn("UnrecoverableFileError", error_line)
self.failUnlessIn("no recoverable versions", error_line)
self.failUnless(len(error_msg) > 2, error_msg_s) # some traceback
units = [simplejson.loads(line) for line in lines[:first_error]]