join threads correctly

Author: wtdcode

tests/test_tendaac15_httpd.py

@@ -31,7 +31,7 @@
 class ELFTest(unittest.TestCase):
 
     def test_tenda_ac15_arm(self):
-        stop = False
+
         def nvram_listener():
             server_address = '../examples/rootfs/arm_tendaac15/var/cfm_socket'
 
@@ -47,23 +47,19 @@ def nvram_listener():
             sock.listen(1)
 
             data = bytearray()
+            connection, _ = sock.accept()
+            try:
+                while True:
+                    data += connection.recv(1024)
 
-            while True:
-                connection, _ = sock.accept()
-
-                try:
-                    while True:
-                        data += connection.recv(1024)
-
-                        if b"lan.webiplansslen" in data:
-                            connection.send(b'192.168.170.169')
-                        else:
-                            break
+                    if b"lan.webiplansslen" in data:
+                        connection.send(b'192.168.170.169')
+                    else:
+                        break
 
-                        data.clear()
-                finally:
-                    connection.close()
-                    break
+                    data.clear()
+            finally:
+                connection.close()
 
         def patcher(ql: Qiling):
             br0_addr = ql.mem.search(b'br0\x00')
@@ -75,8 +71,7 @@ def my_tenda():
             ql = Qiling(["../examples/rootfs/arm_tendaac15/bin/httpd"], "../examples/rootfs/arm_tendaac15", verbose=QL_VERBOSE.DEBUG)
             ql.add_fs_mapper("/dev/urandom", "/dev/urandom")
             ql.hook_address(patcher, ql.loader.elf_entry)
-            while not stop:
-                ql.run(count=5000)
+            ql.run(count=825000)
 
         if __name__ == "__main__":
             threads = [
@@ -105,9 +100,9 @@ def my_tenda():
             response = conn.getresponse()
 
             self.assertIn(b"Please update your documents to reflect the new location.", response.read())
-            stop = True
             for th in threads:
-                th.join()
+                th.join(timeout=10.0)
+                self.assertFalse(th.is_alive())
 
 if __name__ == "__main__":
     unittest.main()