From 2c58d3399c9a673bd0f0edaafc886329fdfd4148 Mon Sep 17 00:00:00 2001
From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Mon, 3 Dec 2007 15:25:14 -0700
Subject: [PATCH] merge patch to integrate decentralized directories with patch
to "only test log.err when Twisted is new enough to let us ignore the
generated errors"
---
src/allmydata/mutable.py | 2 +-
src/allmydata/test/test_mutable.py | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/allmydata/mutable.py b/src/allmydata/mutable.py
index 661afc49..c8fa347f 100644
--- 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 eda4ec29..fc93d1c3 100644
--- 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"
--
2.45.2