CheckResults: pass IServer to servers_responding=, getter returns serverid

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / test / common.py

diff --git a/src/allmydata/test/common.py b/src/allmydata/test/common.py
index 6f19df145e48403f7d593994fbe26ba180ae4e96..deb9d139cb659865dd179b8a1a102256fa83fdb7 100644 (file)
--- a/src/allmydata/test/common.py
+++ b/src/allmydata/test/common.py
@@ -67,8 +67,7 @@ class FakeCHKFileNode:
         return self.storage_index
 
     def check(self, monitor, verify=False, add_lease=False):
-        nodeid = "\x00"*20
-        s = StubServer(nodeid)
+        s = StubServer("\x00"*20)
         r = CheckResults(self.my_uri, self.storage_index,
                          healthy=True, recoverable=True,
                          needs_rebalancing=False,
@@ -78,7 +77,7 @@ class FakeCHKFileNode:
                          count_good_share_hosts=10,
                          count_recoverable_versions=1,
                          count_unrecoverable_versions=0,
-                         servers_responding=[nodeid],
+                         servers_responding=[s],
                          sharemap={1: [s]},
                          count_wrong_shares=0,
                          list_corrupt_shares=[],
@@ -280,8 +279,7 @@ class FakeMutableFileNode:
         return self.file_types[self.storage_index]
 
     def check(self, monitor, verify=False, add_lease=False):
-        nodeid = "\x00"*20
-        s = StubServer(nodeid)
+        s = StubServer("\x00"*20)
         r = CheckResults(self.my_uri, self.storage_index,
                          healthy=True, recoverable=True,
                          needs_rebalancing=False,
@@ -291,7 +289,7 @@ class FakeMutableFileNode:
                          count_good_share_hosts=10,
                          count_recoverable_versions=1,
                          count_unrecoverable_versions=0,
-                         servers_responding=[nodeid],
+                         servers_responding=[s],
                          sharemap={"seq1-abcd-sh0": [s]},
                          count_wrong_shares=0,
                          list_corrupt_shares=[],