rrefutil: add check_remote utility function

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / test_util.py

diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py
index 6f99611fe22e9ad941d1a76e657feb8d576cca50..ece54181dddbe14d2186bec23a976edb552ec29f 100644 (file)
--- a/src/allmydata/test/test_util.py
+++ b/src/allmydata/test/test_util.py
@@ -1204,13 +1204,21 @@ class FakeRemoteReference:
 
 class RemoteFailures(unittest.TestCase):
     def test_check(self):
+        check_local = rrefutil.check_local
+        check_remote = rrefutil.check_remote
         try:
             raise IndexError("local missing key")
         except IndexError:
             localf = Failure()
+
         self.failUnlessEqual(localf.check(IndexError, KeyError), IndexError)
         self.failUnlessEqual(localf.check(ValueError, KeyError), None)
         self.failUnlessEqual(localf.check(ServerFailure), None)
+        self.failUnlessEqual(check_local(localf, IndexError, KeyError),
+                             IndexError)
+        self.failUnlessEqual(check_local(localf, ValueError, KeyError), None)
+        self.failUnlessEqual(check_remote(localf, IndexError, KeyError), None)
+        self.failUnlessEqual(check_remote(localf, ValueError, KeyError), None)
 
         frr = FakeRemoteReference()
         wrr = rrefutil.WrappedRemoteReference(frr)
@@ -1219,6 +1227,11 @@ class RemoteFailures(unittest.TestCase):
             self.failUnlessEqual(f.check(IndexError, KeyError), None)
             self.failUnlessEqual(f.check(ServerFailure, KeyError),
                                  ServerFailure)
+            self.failUnlessEqual(check_remote(f, IndexError, KeyError),
+                                 IndexError)
+            self.failUnlessEqual(check_remote(f, ValueError, KeyError), None)
+            self.failUnlessEqual(check_local(f, IndexError, KeyError), None)
+            self.failUnlessEqual(check_local(f, ValueError, KeyError), None)
         d.addErrback(_check)
         return d