Improve tests

openc3/python/openc3/microservices/interface_microservice.py

@@ -464,6 +464,7 @@ def run(self):
 
 class InterfaceMicroservice(Microservice):
     UNKNOWN_BYTES_TO_PRINT = 16
+    DISCONNECT_WAIT_TIME = 1
 
     def __init__(self, name):
         self.mutex = threading.Lock()
@@ -585,7 +586,7 @@ def run(self):
                 match self.interface.state:
                     case "DISCONNECTED":
                         # Just wait to see if we should connect later
-                        self.interface_thread_sleeper.sleep(1)
+                        self.interface_thread_sleeper.sleep(InterfaceMicroservice.DISCONNECT_WAIT_TIME)
                     case "ATTEMPTING":
                         try:
                             with self.mutex:

openc3/python/test/microservices/test_interface_microservice.py

@@ -284,6 +284,7 @@ def test_connect_handles_parameters(self):
     #     im.shutdown()
 
     def test_handles_a_clean_disconnect(self):
+        InterfaceMicroservice.DISCONNECT_WAIT_TIME = 0.01
         im = InterfaceMicroservice("DEFAULT__INTERFACE__INST_INT")
         all_interfaces = InterfaceStatusModel.all(scope="DEFAULT")
         self.assertEqual(all_interfaces["INST_INT"]["state"], "ATTEMPTING")
@@ -299,7 +300,7 @@ def test_handles_a_clean_disconnect(self):
             self.assertIn(TestInterfaceMicroservice.CONN_SUCCESS_MSG, stdout.getvalue())
 
             InterfaceTopic.disconnect_interface("INST_INT")
-            time.sleep(1.01)  # Allow disconnect
+            time.sleep(0.02)  # Allow disconnect
             all_interfaces = InterfaceStatusModel.all(scope="DEFAULT")
             self.assertEqual(all_interfaces["INST_INT"]["state"], "DISCONNECTED")
             self.assertIn("Disconnect requested", stdout.getvalue())

openc3/python/test/script/test_api_shared.py

@@ -14,6 +14,7 @@
 # This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 
+import os
 import unittest
 from unittest.mock import *
 from test.test_helper import *
@@ -855,6 +856,7 @@ def test_starts_a_script(self):
         for stdout in capture_io():
             start("tester.py")
             self.assertIn("Hello World", stdout.getvalue())
+        os.remove("tester.py")
 
     def test_load_utility_raises(self):
         with self.assertRaisesRegex(

openc3/python/test/utilities/test_thread_manager.py

@@ -21,6 +21,7 @@
 from unittest.mock import Mock
 from openc3.utilities.thread_manager import ThreadManager
 
+
 class TestThreadManager(unittest.TestCase):
     def setUp(self):
         ThreadManager.MONITOR_SLEEP_SECONDS = 0.01
@@ -40,16 +41,21 @@ def test_monitors_threads(self):
 
         def thread1_body():
             time.sleep(0.1)
+
         thread1 = threading.Thread(target=thread1_body)
         thread1.start()
+
         def thread2_body():
             while self.continue2:
                 time.sleep(0.01)
+
         thread2 = threading.Thread(target=thread2_body)
         thread2.start()
+
         def thread3_body():
             while self.continue3:
                 time.sleep(0.01)
+
         thread3 = threading.Thread(target=thread3_body)
         thread3.start()
         # Register all the threads with the ThreadManager
@@ -63,6 +69,7 @@ def thread3_body():
         def monitor_and_shutdown():
             ThreadManager.instance().monitor()
             ThreadManager.instance().shutdown()
+
         manager_thread = threading.Thread(target=monitor_and_shutdown)
         manager_thread.start()
         # Wait for the first thread to finish as the second and third spin
@@ -79,6 +86,7 @@ def monitor_and_shutdown():
     def test_joins_threads(self):
         def task(duration):
             time.sleep(duration)
+
         thread1 = threading.Thread(target=task, args=[0.01])
         thread2 = threading.Thread(target=task, args=[0.1])
         thread3 = threading.Thread(target=task, args=[0.05])

openc3/spec/utilities/thread_manager_spec.rb

@@ -22,11 +22,13 @@
 module OpenC3
   describe ThreadManager do
     before(:all) do
+      ThreadManager.class_variable_set("@@instance", nil)
       @sleep_seconds = ThreadManager::MONITOR_SLEEP_SECONDS
       OpenC3.disable_warnings { ThreadManager::MONITOR_SLEEP_SECONDS = 0.01 }
     end
     after(:all) do
       OpenC3.disable_warnings { ThreadManager::MONITOR_SLEEP_SECONDS = @sleep_seconds }
+      ThreadManager.class_variable_set("@@instance", nil)
     end
 
     it "monitors threads until 1 dies then stops and shutdowns" do
@@ -54,12 +56,14 @@ module OpenC3
       ThreadManager.instance.register(thread1)
       ThreadManager.instance.register(thread2, stop_object: stop_object)
       ThreadManager.instance.register(thread3, shutdown_object: shutdown_object)
-      Thread.new do
+      manager_thread = Thread.new do
         ThreadManager.instance.monitor()
         ThreadManager.instance.shutdown()
       end
       thread1.join()
-      sleep 0.03
+      sleep 0.01
+      manager_thread.join()
+      sleep 0.02 # Allow the other threads to finish
       expect(thread1.alive?).to be false
       expect(thread2.alive?).to be false
       expect(thread3.alive?).to be false