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

Factor duplicate RelayServer construction out

Browse Source
This commit is contained in:
Jean-Paul Calderone 2017-06-28 12:03:04 -04:00 committed by Brian Warner
parent 55b4b333dc
commit aa7013e6f5
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,6 +11,19 @@ from ..server import server, rendezvous
from ..server.rendezvous import Usage, SidedMessage from ..server.rendezvous import Usage, SidedMessage
from ..server.database import get_db from ..server.database import get_db
def easy_relay(
rendezvous_web_port=str("tcp:0"),
transit_port=str("tcp:0"),
advertise_version=None,
**kwargs
):
return server.RelayServer(
rendezvous_web_port,
transit_port,
advertise_version,
**kwargs
)
class _Util: class _Util:
def _nameplate(self, app, name): def _nameplate(self, app, name):
np_row = app._db.execute("SELECT * FROM `nameplates`" np_row = app._db.execute("SELECT * FROM `nameplates`"
@ -1313,7 +1326,7 @@ class Summary(unittest.TestCase):
class DumpStats(unittest.TestCase): class DumpStats(unittest.TestCase):
def test_nostats(self): def test_nostats(self):
rs = server.RelayServer(str("tcp:0"), str("tcp:0"), None) rs = easy_relay()
# with no ._stats_file, this should do nothing # with no ._stats_file, this should do nothing
rs.dump_stats(1, 1) rs.dump_stats(1, 1)
@ -1321,8 +1334,7 @@ class DumpStats(unittest.TestCase):
basedir = self.mktemp() basedir = self.mktemp()
os.mkdir(basedir) os.mkdir(basedir)
fn = os.path.join(basedir, "stats.json") fn = os.path.join(basedir, "stats.json")
rs = server.RelayServer(str("tcp:0"), str("tcp:0"), None, rs = easy_relay(stats_file=fn)
stats_file=fn)
now = 1234 now = 1234
validity = 500 validity = 500
rs.dump_stats(now, validity) rs.dump_stats(now, validity)
@ -1339,12 +1351,7 @@ class Startup(unittest.TestCase):
@mock.patch('wormhole.server.server.log') @mock.patch('wormhole.server.server.log')
def test_empty(self, fake_log): def test_empty(self, fake_log):
rs = server.RelayServer( rs = easy_relay(allow_list=False)
str("tcp:0"),
str("tcp:0"),
None,
allow_list=False,
)
rs.startService() rs.startService()
try: try:
logs = '\n'.join([call[1][0] for call in fake_log.mock_calls]) logs = '\n'.join([call[1][0] for call in fake_log.mock_calls])