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

fix some python2.5 incompatibilities, and remove an old webish display that suggested we might know about peers but not be connected to them

Browse Source
This commit is contained in:
Brian Warner 2007-03-27 17:44:49 -07:00
parent 022b5af4ac
commit 611178490a
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,8 @@ class SystemTest(unittest.TestCase):
def wait_for_connections(self, ignored=None):
for c in self.clients:
if not c.introducer_client or len(c.get_all_peerids()) != self.numclients:
if (not c.introducer_client or
len(list(c.get_all_peerids())) != self.numclients):
d = defer.Deferred()
d.addCallback(self.wait_for_connections)
reactor.callLater(0.05, d.callback, None)
@ -103,7 +104,7 @@ class SystemTest(unittest.TestCase):
def _check(extra_node):
self.extra_node = extra_node
for c in self.clients:
self.failUnlessEqual(len(c.get_all_peerids()), 6)
self.failUnlessEqual(len(list(c.get_all_peerids())), 6)
d.addCallback(_check)
def _shutdown_extra_node(res):
if self.extra_node:

3
src/allmydata/web/welcome.xhtml
View File

@ -16,8 +16,7 @@
<div>Queen: <span n:render="string" n:data="queen_pburl" /></div>
<div>Connected to queen?: <span n:render="string" n:data="connected_to_queen" /></div>
<div>Known Peers: <span n:render="string" n:data="num_peers" /></div>
<div>Connected Peers: <span n:render="string" n:data="num_connected_peers" /></div>
<div>Known+Connected Peers: <span n:render="string" n:data="num_peers" /></div>
<div>
<table n:render="sequence" n:data="peers" border="1">

4
src/allmydata/webish.py
View File

@ -36,9 +36,7 @@ class Welcome(rend.Page):
def data_num_peers(self, ctx, data):
#client = inevow.ISite(ctx)._client
client = IClient(ctx)
return len(client.get_all_peerids())
def data_num_connected_peers(self, ctx, data):
return len(IClient(ctx).get_all_peerids())
return len(list(client.get_all_peerids()))
def data_peers(self, ctx, data):
d = []