open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/ServerBase: control advertise_version=

Browse Source 
we'll disable this for most tests, but a few want to see it in the welcome
message
This commit is contained in:
Brian Warner 2017-06-26 14:34:07 +01:00
parent 5e5dbd90b3
commit f282649f81
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wormhole/test/common.py
View File

@ -12,7 +12,7 @@ class ServerBase:
def setUp(self): def setUp(self):
self._setup_relay(None) self._setup_relay(None)
def _setup_relay(self, error): def _setup_relay(self, error, advertise_version=None):
self.sp = service.MultiService() self.sp = service.MultiService()
self.sp.startService() self.sp.startService()
self.relayport = allocate_tcp_port() self.relayport = allocate_tcp_port()
@ -21,7 +21,7 @@ class ServerBase:
# endpoints.serverFromString # endpoints.serverFromString
s = RelayServer("tcp:%d:interface=127.0.0.1" % self.relayport, s = RelayServer("tcp:%d:interface=127.0.0.1" % self.relayport,
"tcp:%s:interface=127.0.0.1" % self.transitport, "tcp:%s:interface=127.0.0.1" % self.transitport,
advertise_version="advertised.version", advertise_version=advertise_version,
signal_error=error) signal_error=error)
s.setServiceParent(self.sp) s.setServiceParent(self.sp)
self._relay_server = s self._relay_server = s

2
src/wormhole/test/test_server.py
View File

@ -605,7 +605,7 @@ class WSClientSync(unittest.TestCase):
class WebSocketAPI(_Util, ServerBase, unittest.TestCase): class WebSocketAPI(_Util, ServerBase, unittest.TestCase):
def setUp(self): def setUp(self):
self._clients = [] self._clients = []
return ServerBase.setUp(self) self._setup_relay(None, advertise_version="advertised.version")
def tearDown(self): def tearDown(self):
for c in self._clients: for c in self._clients:

4
src/wormhole/test/test_wormhole.py
View File

@ -105,6 +105,10 @@ class Delegated(ServerBase, unittest.TestCase):
class Wormholes(ServerBase, unittest.TestCase): class Wormholes(ServerBase, unittest.TestCase):
# integration test, with a real server # integration test, with a real server
def setUp(self):
# test_welcome wants to see [current_cli_version]
self._setup_relay(None, advertise_version="advertised.version")
def doBoth(self, d1, d2): def doBoth(self, d1, d2):
return gatherResults([d1, d2], True) return gatherResults([d1, d2], True)