torproject/stem
1
0
Fork 0
mirror of https://github.com/torproject/stem.git synced 2025-03-02 06:45:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop test_attachstream retries

Browse Source 
Our test_attachstream test attempted to establish a connection ten times, but
in the dozen attempts I just ran it always works on its first try.
This commit is contained in:
Damian Johnson 2020-07-21 15:41:53 -07:00
parent 22c076d9a6
commit 637b388c94
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
test/integ/control/controller.py
View File

@ -1533,31 +1533,26 @@ class TestController(unittest.TestCase):
async with await test.runner.get_runner().get_tor_controller() as controller:
# try 10 times to build a circuit we can connect through
for i in range(10):
await controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM)
await controller.set_conf('__LeaveStreamsUnattached', '1')
await controller.add_event_listener(handle_streamcreated, stem.control.EventType.STREAM)
await controller.set_conf('__LeaveStreamsUnattached', '1')
try:
circuit_id = await controller.new_circuit(await_build = True)
socks_listener = (await controller.get_listeners(Listener.SOCKS))[0]
try:
circuit_id = await controller.new_circuit(await_build = True)
socks_listener = (await controller.get_listeners(Listener.SOCKS))[0]
with test.network.Socks(socks_listener) as s:
s.settimeout(5)
with test.network.Socks(socks_listener) as s:
s.settimeout(5)
t = threading.Thread(target = s.connect, args = ((host, port),))
t.start()
t = threading.Thread(target = s.connect, args = ((host, port),))
t.start()
await asyncio.wait_for(stream_attached.wait(), timeout = 6)
streams = await controller.get_streams()
await asyncio.wait_for(stream_attached.wait(), timeout = 6)
streams = await controller.get_streams()
t.join()
break
except (stem.CircuitExtensionFailed, socket.timeout):
continue
finally:
await controller.remove_event_listener(handle_streamcreated)
await controller.reset_conf('__LeaveStreamsUnattached')
t.join()
finally:
await controller.remove_event_listener(handle_streamcreated)
await controller.reset_conf('__LeaveStreamsUnattached')
our_stream = [stream for stream in streams if stream.target_address == host][0]