From: Brian Warner <warner@allmydata.com>
Date: Tue, 22 Apr 2008 19:54:16 +0000 (-0700)
Subject: test_introducer.py: don't log nodeids as binary goop
X-Git-Tag: allmydata-tahoe-1.1.0~194
X-Git-Url: https://git.rkrishnan.org/simplejson/decoder.py.html?a=commitdiff_plain;h=57d5341715eab10bbb1f0b123affed6ea9552be9;p=tahoe-lafs%2Ftahoe-lafs.git

test_introducer.py: don't log nodeids as binary goop
---

diff --git a/src/allmydata/test/test_introducer.py b/src/allmydata/test/test_introducer.py
index 65ac8719..4d115518 100644
--- a/src/allmydata/test/test_introducer.py
+++ b/src/allmydata/test/test_introducer.py
@@ -10,7 +10,7 @@ from foolscap import Tub, Referenceable
 from foolscap.eventual import fireEventually, flushEventualQueue
 from twisted.application import service
 from allmydata.introducer import IntroducerClient, IntroducerService, IntroducerNode
-from allmydata.util import testutil
+from allmydata.util import testutil, idlib
 
 class FakeNode(Referenceable):
     pass
@@ -117,8 +117,9 @@ class TestIntroducer(unittest.TestCase, testutil.PollMixin):
             # now disconnect somebody's connection to someone else
             current_counter = origin_c.counter
             victim_nodeid = b32decode(tubs[clients[1]].tubID.upper())
-            log.msg(" disconnecting %s->%s" % (tubs[origin_c].tubID,
-                                               victim_nodeid))
+            log.msg(" disconnecting %s->%s" %
+                    (tubs[origin_c].tubID,
+                     idlib.shortnodeid_b2a(victim_nodeid)))
             origin_c.debug_disconnect_from_peerid(victim_nodeid)
             log.msg(" did disconnect")
 
@@ -142,8 +143,9 @@ class TestIntroducer(unittest.TestCase, testutil.PollMixin):
             # now disconnect somebody's connection to themselves.
             current_counter = origin_c.counter
             victim_nodeid = b32decode(tubs[clients[0]].tubID.upper())
-            log.msg(" disconnecting %s->%s" % (tubs[origin_c].tubID,
-                                               victim_nodeid))
+            log.msg(" disconnecting %s->%s" %
+                    (tubs[origin_c].tubID,
+                     idlib.shortnodeid_b2a(victim_nodeid)))
             origin_c.debug_disconnect_from_peerid(victim_nodeid)
             log.msg(" did disconnect from self")