Fix: threads used in testing don't close their DB connections (#195)

src/meshapi/tests/test_join_form.py

@@ -1,5 +1,4 @@
 import json
-import threading
 import time
 from unittest import mock
 
@@ -11,6 +10,7 @@
 
 from .sample_data import sample_building
 from .sample_join_form_data import *
+from .util import TestThread
 
 # Grab a reference to the original Install.__init__ function, so that when it gets mocked
 # we can still use it when we need it
@@ -293,9 +293,9 @@ def invoke_join_form(submission, results):
                 response = self.c.post("/api/v1/join/", request, content_type="application/json")
                 results.append(response)
 
-        t1 = threading.Thread(target=invoke_join_form, args=(member1_submission, results))
+        t1 = TestThread(target=invoke_join_form, args=(member1_submission, results))
         time.sleep(0.5)  # Sleep to give the first thread a head start
-        t2 = threading.Thread(target=invoke_join_form, args=(member2_submission, results))
+        t2 = TestThread(target=invoke_join_form, args=(member2_submission, results))
 
         t1.start()
         t2.start()

src/meshapi/tests/test_nn.py

@@ -1,5 +1,4 @@
 import json
-import threading
 import time
 from unittest import mock
 
@@ -12,6 +11,7 @@
 from ..views import get_next_available_network_number
 from .group_helpers import create_groups
 from .sample_data import sample_building, sample_install, sample_member
+from .util import TestThread
 
 
 # Test basic NN form stuff (input validation, etc)
@@ -361,8 +361,8 @@ def invoke_nn_form(install_num: int, outputs_dict: dict):
                 )
                 outputs_dict[install_num] = result
 
-        t1 = threading.Thread(target=invoke_nn_form, args=(self.install_number1, outputs_dict))
-        t2 = threading.Thread(target=invoke_nn_form, args=(self.install_number2, outputs_dict))
+        t1 = TestThread(target=invoke_nn_form, args=(self.install_number1, outputs_dict))
+        t2 = TestThread(target=invoke_nn_form, args=(self.install_number2, outputs_dict))
 
         t1.start()
         t2.start()
@@ -411,8 +411,8 @@ def invoke_nn_form(install_num: int, outputs: list):
                 )
                 outputs.append(result)
 
-        t1 = threading.Thread(target=invoke_nn_form, args=(self.install_number1, outputs))
-        t2 = threading.Thread(target=invoke_nn_form, args=(self.install_number1, outputs))
+        t1 = TestThread(target=invoke_nn_form, args=(self.install_number1, outputs))
+        t2 = TestThread(target=invoke_nn_form, args=(self.install_number1, outputs))
 
         t1.start()
         t2.start()

src/meshapi/tests/util.py

@@ -0,0 +1,10 @@
+from threading import Thread
+
+from django.db import connection
+
+
+class TestThread(Thread):
+    def run(self):
+        super().run()
+
+        connection.close()