tahoe-lafs/tahoe-lafs
tahoe-lafs
/
tahoe-lafs
2
0
Fork 0
Code Issues Pull Requests 23 Packages Projects Releases 1 Wiki Activity

Remove another test use of get_rref

This commit is contained in:
Jean-Paul Calderone 2019-05-31 16:09:29 -04:00
parent e745dbfb66
commit d32d020b05
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/storage_client.py
View File

@ -437,7 +437,7 @@ class NativeStorageServer(service.MultiService):
# attribute may change over time as connections are lost and # attribute may change over time as connections are lost and
# re-established. The _StorageServer should always be able to get the # re-established. The _StorageServer should always be able to get the
# most up-to-date value. # most up-to-date value.
return _StorageServer(get_rref=lambda: self._rref) return _StorageServer(get_rref=self.get_rref)
def _lost(self): def _lost(self):
log.msg(format="lost connection to %(name)s", name=self.get_name(), log.msg(format="lost connection to %(name)s", name=self.get_name(),

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

@ -2511,9 +2511,9 @@ class Connections(SystemTestMixin, unittest.TestCase):
self.failUnlessEqual(len(nonclients), 1) self.failUnlessEqual(len(nonclients), 1)
self.s1 = nonclients[0] # s1 is the server, not c0 self.s1 = nonclients[0] # s1 is the server, not c0
self.s1_rref = self.s1.get_rref() self.s1_storage_server = self.s1.get_storage_server()
self.failIfEqual(self.s1_rref, None) self.assertIsNot(self.s1_storage_server, None)
self.failUnless(self.s1.is_connected()) self.assertTrue(self.s1.is_connected())
d.addCallback(_start) d.addCallback(_start)
# now shut down the server # now shut down the server
@ -2524,9 +2524,9 @@ class Connections(SystemTestMixin, unittest.TestCase):
d.addCallback(lambda ign: self.poll(_poll)) d.addCallback(lambda ign: self.poll(_poll))
def _down(ign): def _down(ign):
self.failIf(self.s1.is_connected()) self.assertFalse(self.s1.is_connected())
rref = self.s1.get_rref() storage_server = self.s1.get_storage_server()
self.failUnless(rref) self.assertIsNot(storage_server, None)
self.failUnlessIdentical(rref, self.s1_rref) self.assertEqual(storage_server, self.s1_storage_server)
d.addCallback(_down) d.addCallback(_down)
return d return d