merge patch to integrate decentralized directories with patch "download: use hierarch...

diff --git a/src/allmydata/test/test_upload.py b/src/allmydata/test/test_upload.py
index f4318565e313b46dc500771a9bd3b480f48b4e05..7ec458e53bbcb6fc3c031339419b50e6f106b3c6 100644 (file)
--- 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) ]