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

get rid of double-flush() pairing with florian

Browse Source
This commit is contained in:
meejah 2021-04-12 08:44:06 -06:00
parent 591740ce5f
commit 6efc274b81
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wormhole_transit_relay/test/common.py
View File

@ -55,8 +55,11 @@ class ServerBase:
self._setup_relay(blur_usage=blur_usage) self._setup_relay(blur_usage=blur_usage)
def flush(self): def flush(self):
did_work = False
for pump in self._pumps: for pump in self._pumps:
pump.flush() did_work = pump.flush() or did_work
if did_work:
self.flush()
def _setup_relay(self, blur_usage=None, log_file=None, usage_db=None): def _setup_relay(self, blur_usage=None, log_file=None, usage_db=None):
self._transit_server = Transit( self._transit_server = Transit(

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

@ -61,7 +61,6 @@ class _Transit:
self.flush() self.flush()
p2.send(handshake(token1, side=None)) p2.send(handshake(token1, side=None))
self.flush() self.flush()
self.flush()
# a correct handshake yields an ack, after which we can send # a correct handshake yields an ack, after which we can send
exp = b"ok\n" exp = b"ok\n"
@ -89,7 +88,6 @@ class _Transit:
self.flush() self.flush()
p2.send(handshake(token1, side=None)) p2.send(handshake(token1, side=None))
self.flush() self.flush()
self.flush()
# a correct handshake yields an ack, after which we can send # a correct handshake yields an ack, after which we can send
exp = b"ok\n" exp = b"ok\n"
@ -117,7 +115,6 @@ class _Transit:
p1.send(handshake(token1, side=None)) p1.send(handshake(token1, side=None))
p2.send(handshake(token1, side=side1)) p2.send(handshake(token1, side=side1))
self.flush() self.flush()
self.flush()
# a correct handshake yields an ack, after which we can send # a correct handshake yields an ack, after which we can send
exp = b"ok\n" exp = b"ok\n"
@ -147,7 +144,6 @@ class _Transit:
self.flush() self.flush()
p2.send(handshake(token1, side=side2)) p2.send(handshake(token1, side=side2))
self.flush() self.flush()
self.flush()
# a correct handshake yields an ack, after which we can send # a correct handshake yields an ack, after which we can send
exp = b"ok\n" exp = b"ok\n"
@ -187,7 +183,6 @@ class _Transit:
side2 = b"\x02"*8 side2 = b"\x02"*8
p3.send(handshake(token1, side=side2)) p3.send(handshake(token1, side=side2))
self.flush() self.flush()
self.flush()
self.assertEqual(self.count(), 0) self.assertEqual(self.count(), 0)
self.assertEqual(len(self._transit_server._pending_requests), 0) self.assertEqual(len(self._transit_server._pending_requests), 0)
self.assertEqual(len(self._transit_server._active_connections), 2) self.assertEqual(len(self._transit_server._active_connections), 2)
@ -453,7 +448,6 @@ class Usage(ServerBase, unittest.TestCase):
p2.send(handshake(token1, side=side2)) p2.send(handshake(token1, side=side2))
self.flush() self.flush()
self.flush()
self.assertEqual(len(self._transit_server._pending_requests), 0) self.assertEqual(len(self._transit_server._pending_requests), 0)
self.assertEqual(len(self._usage), 2, self._usage) self.assertEqual(len(self._usage), 2, self._usage)
(started, result, total_bytes, total_time, waiting_time) = self._usage[1] (started, result, total_bytes, total_time, waiting_time) = self._usage[1]