ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-18 02:40:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

now that foolscap-0.0.7 accepts connect-to-self, allow peers to know about themselves. We now require foolscap-0.0.7

Browse Source
This commit is contained in:
Brian Warner 2007-01-16 15:12:49 -07:00
parent 2150ac0e53
commit 56cf2dbd7e
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/client.py
View File

@ -100,8 +100,6 @@ class Client(node.Node, Referenceable):
def remote_add_peers(self, new_peers):
for nodeid, pburl in new_peers:
if nodeid == self.nodeid:
continue
self.log("adding peer %s" % idlib.b2a(nodeid))
if nodeid in self.all_peers:
self.log("weird, I already had an entry for them")

4
src/allmydata/queen.py
View File

@ -32,12 +32,12 @@ class Roster(service.MultiService, Referenceable):
def remote_hello(self, nodeid, node, pburl):
log.msg("roster: contact from %s" % idlib.b2a(nodeid))
self.phonebook[nodeid] = pburl
self.connections[nodeid] = node
eventually(self._educate_the_new_peer,
nodeid, node, list(self.phonebook.items()))
eventually(self._announce_new_peer,
nodeid, pburl, list(self.connections.values()))
self.phonebook[nodeid] = pburl
self.connections[nodeid] = node
node.notifyOnDisconnect(self._lost_node, nodeid)
return self.gvd_root

18
src/allmydata/test/test_system.py
View File

@ -81,7 +81,7 @@ class SystemTest(unittest.TestCase):
def wait_for_connections(self, ignored=None):
for c in self.clients:
if len(c.connections) != self.numclients - 1:
if len(c.connections) != self.numclients:
d = defer.Deferred()
d.addCallback(self.wait_for_connections)
reactor.callLater(0.05, d.callback, None)
@ -92,17 +92,17 @@ class SystemTest(unittest.TestCase):
d = self.set_up_nodes()
d.addCallback(lambda res: self.add_extra_node(5))
def _check(extra_node):
self.extra_node = extra_node
for c in self.clients:
self.failUnlessEqual(len(c.connections), 5)
return extra_node
self.failUnlessEqual(len(c.connections), 6)
d.addCallback(_check)
def _shutdown_extra_node(extra_node):
d1 = extra_node.stopService()
def _shutdown_extra_node(res):
d1 = self.extra_node.stopService()
d2 = defer.Deferred()
reactor.callLater(self.DISCONNECT_DELAY, d2.callback, None)
d1.addCallback(lambda res: d2)
reactor.callLater(self.DISCONNECT_DELAY, d2.callback, res)
d1.addCallback(lambda ignored: d2)
return d1
d.addCallback(_shutdown_extra_node)
d.addBoth(_shutdown_extra_node)
return d
test_connections.timeout = 20
@ -161,7 +161,7 @@ class SystemTest(unittest.TestCase):
base = self.webish_url
d = getPage(base)
def _got_welcome(page):
expected = "Connected Peers: <span>%d</span>" % (self.numclients-1)
expected = "Connected Peers: <span>%d</span>" % (self.numclients)
self.failUnless(expected in page,
"I didn't see the right 'connected peers' message "
"in: %s" % page