merge patch to integrate decentralized directories with patch to "only test log.err...

diff --git a/src/allmydata/mutable.py b/src/allmydata/mutable.py
index 661afc49335a207a8aedb405b005ebaaf2de45e1..c8fa347fe6916120551b51d7f1fd037ac618ce98 100644 (file)
--- a/src/allmydata/mutable.py
+++ b/src/allmydata/mutable.py
@@ -757,7 +757,7 @@ class Publish:
         # 4a: may need to run recovery algorithm
         # 5: when enough responses are back, we're done
 
-        self.log("starting publish, data is %r" % (newdata,))
+        self.log("got enough peers, datalen is %s" % len(newdata))
 
         self._writekey = self._node.get_writekey()
         assert self._writekey, "need write capability to publish"

diff --git a/src/allmydata/test/test_mutable.py b/src/allmydata/test/test_mutable.py
index eda4ec29d15126f33aec98f70eb2825d61b79930..fc93d1c3d2b660d7c0d46c9e6af5d7d81c28aacf 100644 (file)
--- a/src/allmydata/test/test_mutable.py
+++ b/src/allmydata/test/test_mutable.py
@@ -111,8 +111,9 @@ class FakeClient:
         self._num_peers = num_peers
         self._peerids = [tagged_hash("peerid", "%d" % i)[:20]
                          for i in range(self._num_peers)]
-    def log(self, msg):
-        log.msg(msg)
+        self.introducer_client = FakeIntroducerClient()
+    def log(self, msg, **kw):
+        return log.msg(msg, **kw)
 
     def get_renewal_secret(self):
         return "I hereby permit you to renew my files"