test: Scale NetworkThread close timeout with timeout_factor
This commit is contained in:
2 files changed
+2
-2
No files matched your search
@@ -743,7 +743,7 @@ class NetworkThread(threading.Thread):
|
|||||||
"""Start the network thread."""
|
"""Start the network thread."""
|
||||||
self.network_event_loop.run_forever()
|
self.network_event_loop.run_forever()
|
||||||
|
|
||||||
def close(self, *, timeout=10):
|
def close(self, *, timeout):
|
||||||
"""Close the connections and network event loop."""
|
"""Close the connections and network event loop."""
|
||||||
self.network_event_loop.call_soon_threadsafe(self.network_event_loop.stop)
|
self.network_event_loop.call_soon_threadsafe(self.network_event_loop.stop)
|
||||||
wait_until_helper_internal(lambda: not self.network_event_loop.is_running(), timeout=timeout)
|
wait_until_helper_internal(lambda: not self.network_event_loop.is_running(), timeout=timeout)
|
||||||
|
|||||||
@@ -278,7 +278,7 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
|||||||
pdb.set_trace()
|
pdb.set_trace()
|
||||||
|
|
||||||
self.log.debug('Closing down network thread')
|
self.log.debug('Closing down network thread')
|
||||||
self.network_thread.close()
|
self.network_thread.close(timeout=self.options.timeout_factor * 10)
|
||||||
if self.success == TestStatus.FAILED:
|
if self.success == TestStatus.FAILED:
|
||||||
self.log.info("Not stopping nodes as test failed. The dangling processes will be cleaned up later.")
|
self.log.info("Not stopping nodes as test failed. The dangling processes will be cleaned up later.")
|
||||||
else:
|
else:
|
||||||
|
|||||||
Reference in new issue
Block a user