From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 3 Dec 2007 22:27:21 +0000 (-0700)
Subject: merge patch to integrate decentralized directories with patch "download: use hierarch... 
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=e28d7c580c30e4982c941474f29e1fc6bcd78bfe;p=tahoe-lafs%2Ftahoe-lafs.git

merge patch to integrate decentralized directories with patch "download: use hierarchical logging"
---

diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py
index f4318565..7ec458e5 100644
--- a/src/allmydata/test/test_upload.py
+++ b/src/allmydata/test/test_upload.py
@@ -139,6 +139,9 @@ class FakeClient:
     def __init__(self, mode="good", num_servers=50):
         self.mode = mode
         self.num_servers = num_servers
+        self.introducer_client = FakeIntroducerClient()
+    def log(self, *args, **kwargs):
+        pass
     def get_permuted_peers(self, storage_index, include_myself):
         peers = [ ("%20d"%fakeid, "%20d"%fakeid, FakePeer(self.mode),)
                   for fakeid in range(self.num_servers) ]