From 2e2b869ec2b772c4ac436d02cf2ea79adc9f8c75 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Mon, 18 Apr 2016 17:57:14 -0700 Subject: [PATCH] tests: internal changes --- tests/common.py | 2 +- tests/test_blocking.py | 8 ++++---- tests/test_server.py | 2 +- tests/test_twisted.py | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/common.py b/tests/common.py index a14a43e..80b2da2 100644 --- a/tests/common.py +++ b/tests/common.py @@ -15,7 +15,7 @@ class ServerBase: "tcp:%s:interface=127.0.0.1" % transitport, __version__) s.setServiceParent(self.sp) - self._relay_server = s._rendezvous + self._rendezvous = s._rendezvous self._transit_server = s._transit self.relayurl = u"http://127.0.0.1:%d/wormhole-relay/" % relayport self.transit = u"tcp:127.0.0.1:%d" % transitport diff --git a/tests/test_blocking.py b/tests/test_blocking.py index b64100c..cb35714 100644 --- a/tests/test_blocking.py +++ b/tests/test_blocking.py @@ -52,14 +52,14 @@ class Channel(ServerBase, unittest.TestCase): # deallocating one side is not enough to destroy the channel d.addCallback(lambda _: deferToThread(c2.deallocate)) def _not_yet(_): - self._relay_server.prune() - self.failUnlessEqual(len(self._relay_server._apps), 1) + self._rendezvous.prune() + self.failUnlessEqual(len(self._rendezvous._apps), 1) d.addCallback(_not_yet) # but deallocating both will make the messages go away d.addCallback(lambda _: deferToThread(c1.deallocate, u"sad")) def _gone(_): - self._relay_server.prune() - self.failUnlessEqual(len(self._relay_server._apps), 0) + self._rendezvous.prune() + self.failUnlessEqual(len(self._rendezvous._apps), 0) d.addCallback(_gone) return d diff --git a/tests/test_server.py b/tests/test_server.py index 1d76755..723e8c7 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -53,7 +53,7 @@ class Reachable(ServerBase, unittest.TestCase): def unjson(data): return json.loads(data.decode("utf-8")) -class API(ServerBase, unittest.TestCase): +class WebAPI(ServerBase, unittest.TestCase): def build_url(self, path, appid, channelid): url = self.relayurl+path queryargs = [] diff --git a/tests/test_twisted.py b/tests/test_twisted.py index c8159b0..8604930 100644 --- a/tests/test_twisted.py +++ b/tests/test_twisted.py @@ -51,14 +51,14 @@ class Channel(ServerBase, unittest.TestCase): # deallocating one side is not enough to destroy the channel d.addCallback(lambda _: c2.deallocate()) def _not_yet(_): - self._relay_server.prune() - self.failUnlessEqual(len(self._relay_server._apps), 1) + self._rendezvous.prune() + self.failUnlessEqual(len(self._rendezvous._apps), 1) d.addCallback(_not_yet) # but deallocating both will make the messages go away d.addCallback(lambda _: c1.deallocate(u"sad")) def _gone(_): - self._relay_server.prune() - self.failUnlessEqual(len(self._relay_server._apps), 0) + self._rendezvous.prune() + self.failUnlessEqual(len(self._rendezvous._apps), 0) d.addCallback(_gone) d.addCallback(lambda _: cm1.shutdown())