From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Thu, 25 Sep 2008 16:15:44 +0000 (-0700)
Subject: setup: remove a few minimal unit tests from test_filenode which have been obviated... 
X-Git-Url: https://git.rkrishnan.org/simplejson/$top_link?a=commitdiff_plain;h=39f305e44f8fae6647a4f4d13a8c9b1302f1db73;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove a few minimal unit tests from test_filenode which have been obviated by much better tests in test_mutable and test_system
---

diff --git a/src/allmydata/immutable/filenode.py b/src/allmydata/immutable/filenode.py
index 7edfd358..2b68d644 100644
--- a/src/allmydata/immutable/filenode.py
+++ b/src/allmydata/immutable/filenode.py
@@ -108,8 +108,6 @@ class LiteralFileNode(ImmutableFileNode):
         return None
 
     def check(self, verify=False):
-        # neither verify= nor repair= affect LIT files, and the check returns
-        # no results.
         return defer.succeed(None)
 
     def check_and_repair(self, verify=False):
diff --git a/src/allmydata/test/test_filenode.py b/src/allmydata/test/test_filenode.py
index 0f759194..f7dfd8bf 100644
--- a/src/allmydata/test/test_filenode.py
+++ b/src/allmydata/test/test_filenode.py
@@ -139,8 +139,7 @@ class Checker(unittest.TestCase):
     def test_literal_filenode(self):
         DATA = "I am a short file."
         u = uri.LiteralFileURI(data=DATA)
-        c = None
-        fn1 = filenode.LiteralFileNode(u, c)
+        fn1 = filenode.LiteralFileNode(u, None)
 
         d = fn1.check()
         def _check_checker_results(cr):
@@ -152,29 +151,6 @@ class Checker(unittest.TestCase):
 
         return d
 
-    def test_mutable_filenode(self):
-        client = None
-        wk = "\x00"*16
-        fp = "\x00"*32
-        rk = hashutil.ssk_readkey_hash(wk)
-        si = hashutil.ssk_storage_index_hash(rk)
-
-        u = uri.WriteableSSKFileURI("\x00"*16, "\x00"*32)
-        n = MutableFileNode(client).init_from_uri(u)
-
-        n.checker_class = FakeMutableChecker
-        n.check_and_repairer_class = FakeMutableCheckAndRepairer
-
-        d = n.check()
-        def _check_checker_results(cr):
-            self.failUnless(cr.is_healthy())
-        d.addCallback(_check_checker_results)
-
-        d.addCallback(lambda res: n.check(verify=True))
-        d.addCallback(_check_checker_results)
-
-        return d
-
 class FakeMutableChecker:
     def __init__(self, node):
         self.r = CheckerResults(node.get_storage_index())