test: reset reactor state

Author: roshii

conftest.py

@@ -3,6 +3,7 @@
 import subprocess
 from shlex import split
 from time import sleep
+from twisted.internet import reactor
 from typing import Any, Tuple
 
 import pytest
@@ -172,3 +173,19 @@ def setup_regtest_bitcoind(pytestconfig):
     local_command(stop_cmd)
     # note, it is better to clean out ~/.bitcoin/regtest but too
     # dangerous to automate it here perhaps
+
+
+@pytest.fixture(autouse=True)
+def reset_reactor_state(request):
+    """Reset reactor _startedBefore flag after twisted.trial tests.
+
+    twisted.trial stops the reactor after each test, which marks it as
+    _startedBefore=True, preventing subsequent tests from running the reactor.
+    This fixture resets the flag to allow other tests to use the reactor.
+    """
+
+    def reset_flag():
+        if hasattr(reactor, "_startedBefore") and reactor._startedBefore:
+            if not reactor.running:
+                reactor._startedBefore = False
+    request.addfinalizer(reset_flag)

test/jmdaemon/test_irc_messaging.py

@@ -4,6 +4,7 @@
 import time
 from twisted.trial import unittest
 from twisted.internet import reactor, task
+from twisted.internet.error import AlreadyCancelled
 from jmdaemon import IRCMessageChannel, MessageChannelCollection
 #needed for test framework
 from jmclient import (load_test_config, get_mchannels, jm_single)
@@ -118,13 +119,20 @@ def setUp(self):
         dm2, mc2, mcc2 = getmc("irc_receiver")
         mcc.run()
         mcc2.run()
-        def cb(m):
-            #don't try to reconnect
-            m.give_up = True
-            m.tcp_connector.disconnect()
-        self.addCleanup(cb, mc)
-        self.addCleanup(cb, mc2)
-        #test_junk_messages()
+        self.mcc = mcc
+        self.mcc2 = mcc2
+        def cancel_delayed_calls():
+            for dc in reactor.getDelayedCalls():
+                try:
+                    dc.cancel()
+                except AlreadyCancelled:
+                    pass
+        self.addCleanup(cancel_delayed_calls)
+        def shutdown_mcs():
+            self.mcc.shutdown()
+            self.mcc2.shutdown()
+        self.addCleanup(shutdown_mcs)
+        # test_junk_messages()
         print("Got here")
 
     def test_waiter(self):