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

test_transit_server: factor out wait()

Browse Source
This commit is contained in:
Brian Warner 2018-02-12 16:52:10 -08:00
parent b3100344eb
commit 547ead75ba
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/wormhole_transit_relay/test/test_transit_server.py
View File

@ -31,6 +31,11 @@ class Accumulator(protocol.Protocol):
self._wait.errback(RuntimeError("closed")) self._wait.errback(RuntimeError("closed"))
self._disconnect.callback(None) self._disconnect.callback(None)
def wait():
d = defer.Deferred()
reactor.callLater(0.001, d.callback, None)
return d
class _Transit: class _Transit:
def test_blur_size(self): def test_blur_size(self):
blur = transit_server.blur_size blur = transit_server.blur_size
@ -62,14 +67,14 @@ class _Transit:
# let that arrive # let that arrive
while self.count() == 0: while self.count() == 0:
yield self.wait() yield wait()
self.assertEqual(self.count(), 1) self.assertEqual(self.count(), 1)
a1.transport.loseConnection() a1.transport.loseConnection()
# let that get removed # let that get removed
while self.count() > 0: while self.count() > 0:
yield self.wait() yield wait()
self.assertEqual(self.count(), 0) self.assertEqual(self.count(), 0)
# the token should be removed too # the token should be removed too
@ -203,10 +208,6 @@ class _Transit:
return sum([len(potentials) return sum([len(potentials)
for potentials for potentials
in self._transit_server._pending_requests.values()]) in self._transit_server._pending_requests.values()])
def wait(self):
d = defer.Deferred()
reactor.callLater(0.001, d.callback, None)
return d
@defer.inlineCallbacks @defer.inlineCallbacks
def test_ignore_same_side(self): def test_ignore_same_side(self):
@ -220,12 +221,12 @@ class _Transit:
b" for side " + hexlify(side1) + b"\n") b" for side " + hexlify(side1) + b"\n")
# let that arrive # let that arrive
while self.count() == 0: while self.count() == 0:
yield self.wait() yield wait()
a2.transport.write(b"please relay " + hexlify(token1) + a2.transport.write(b"please relay " + hexlify(token1) +
b" for side " + hexlify(side1) + b"\n") b" for side " + hexlify(side1) + b"\n")
# let that arrive # let that arrive
while self.count() == 1: while self.count() == 1:
yield self.wait() yield wait()
self.assertEqual(self.count(), 2) # same-side connections don't match self.assertEqual(self.count(), 2) # same-side connections don't match
a1.transport.loseConnection() a1.transport.loseConnection()