From: Brian Warner <warner@allmydata.com>
Date: Fri, 18 Apr 2008 02:55:51 +0000 (-0700)
Subject: test_mutable: factor out ShouldFailMixin
X-Git-Tag: allmydata-tahoe-1.1.0~229
X-Git-Url: https://git.rkrishnan.org/(%5B%5E?a=commitdiff_plain;h=945003ea0f8307095ea896a1e6260d846d183e03;p=tahoe-lafs%2Ftahoe-lafs.git

test_mutable: factor out ShouldFailMixin
---

diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index a3623bf8..888f33c6 100644
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -5,7 +5,7 @@ from twisted.trial import unittest
 from twisted.internet import defer, reactor
 from twisted.python import failure
 from allmydata import uri, download
-from allmydata.util import base32
+from allmydata.util import base32, testutil
 from allmydata.util.idlib import shortnodeid_b2a
 from allmydata.util.hashutil import tagged_hash
 from allmydata.encode import NotEnoughSharesError
@@ -241,7 +241,7 @@ def corrupt(res, s, offset, shnums_to_corrupt=None):
             shares[shnum] = flip_bit(data, real_offset)
     return res
 
-class Filenode(unittest.TestCase):
+class Filenode(unittest.TestCase, testutil.ShouldFailMixin):
     def setUp(self):
         self.client = FakeClient()
 
@@ -325,23 +325,6 @@ class Filenode(unittest.TestCase):
                       self.failUnlessEqual(verinfo[0], expected_seqnum))
         return d
 
-    def shouldFail(self, expected_failure, which, substring,
-                   callable, *args, **kwargs):
-        assert substring is None or isinstance(substring, str)
-        d = defer.maybeDeferred(callable, *args, **kwargs)
-        def done(res):
-            if isinstance(res, failure.Failure):
-                res.trap(expected_failure)
-                if substring:
-                    self.failUnless(substring in str(res),
-                                    "substring '%s' not in '%s'"
-                                    % (substring, str(res)))
-            else:
-                self.fail("%s was supposed to raise %s, not get '%s'" %
-                          (which, expected_failure, res))
-        d.addBoth(done)
-        return d
-
     def test_modify(self):
         def _modifier(old_contents):
             return old_contents + "line2"
@@ -350,7 +333,7 @@ class Filenode(unittest.TestCase):
         def _none_modifier(old_contents):
             return None
         def _error_modifier(old_contents):
-            raise ValueError
+            raise ValueError("oops")
         calls = []
         def _ucw_error_modifier(old_contents):
             # simulate an UncoordinatedWriteError once
@@ -742,7 +725,7 @@ class Servermap(unittest.TestCase):
 
 
 
-class Roundtrip(unittest.TestCase):
+class Roundtrip(unittest.TestCase, testutil.ShouldFailMixin):
     def setUp(self):
         # publish a file and create shares, which can then be manipulated
         # later.
@@ -819,23 +802,6 @@ class Roundtrip(unittest.TestCase):
         return d
 
 
-    def shouldFail(self, expected_failure, which, substring,
-                    callable, *args, **kwargs):
-        assert substring is None or isinstance(substring, str)
-        d = defer.maybeDeferred(callable, *args, **kwargs)
-        def done(res):
-            if isinstance(res, failure.Failure):
-                res.trap(expected_failure)
-                if substring:
-                    self.failUnless(substring in str(res),
-                                    "substring '%s' not in '%s'"
-                                    % (substring, str(res)))
-            else:
-                self.fail("%s was supposed to raise %s, not get '%s'" %
-                          (which, expected_failure, res))
-        d.addBoth(done)
-        return d
-
     def _test_corrupt_all(self, offset, substring,
                           should_succeed=False, corrupt_early=True):
         d = defer.succeed(None)