Create github build action to build Mosquitto and added timeout

to python tests waiting for subprocess to avoid github actione being blocked

Signed-off-by: Norbert Heusser <norbert.heusser@cedalo.com>

.github/workflows/mosquitto-make.yml

@@ -0,0 +1,28 @@
+name: Mosquitto - Make
+
+on:
+  push:
+    branches: [ develop ]
+  pull_request:
+    branches: [ develop ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-20.04
+
+    steps:
+    -
+      name: Install third party dependencies
+      run: sudo apt-get install -y debhelper libc-ares-dev libssl-dev libwrap0-dev python-all python3-all xsltproc docbook-xsl libcunit1-dev libjwt-dev libcjson-dev libcjson1
+    -
+      uses: actions/checkout@v3
+      with:
+        submodules: 'true'
+    -
+      name: make
+      run: make
+    -
+      name: make test
+      run: |
+        make test

test/broker/01-connect-575314.py

@@ -38,7 +38,9 @@ def do_test():
         pass
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-accept-protocol.py

@@ -44,7 +44,9 @@ def do_test(accept, expect_success):
         if write_config is not None:
             os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-allow-anonymous.py

@@ -61,7 +61,9 @@ def do_test(use_conf, write_config, expect_success):
         if write_config is not None:
             os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-disconnect-v5.py

@@ -64,7 +64,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/01-connect-global-max-clients.py

@@ -62,7 +62,9 @@ def do_test():
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-global-max-connections.py

@@ -69,7 +69,9 @@ def do_test():
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-max-connections.py

@@ -69,7 +69,9 @@ def do_test():
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-max-keepalive.py

@@ -33,7 +33,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-take-over.py

@@ -27,7 +27,9 @@ except Exception as e:
     print(e)
 finally:
     broker.terminate()
-    broker.wait()
+    if mosq_test.wait_for_subprocess(broker):
+        print("broker not terminated")
+        if rc == 0: rc=1
     (stdo, stde) = broker.communicate()
     if rc:
         print(stde.decode('utf-8'))

test/broker/01-connect-uname-no-password-denied.py

@@ -35,7 +35,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-uname-or-anon.py

@@ -49,7 +49,9 @@ def do_test(allow_anonymous, password_file, username, expect_success):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-uname-password-denied-no-will.py

@@ -58,7 +58,9 @@ def do_test(proto_ver):
         os.remove(conf_file)
         os.remove(pw_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-uname-password-denied.py

@@ -37,7 +37,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-uname-password-success-no-tls.py

@@ -33,7 +33,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-unix-socket.py

@@ -53,7 +53,9 @@ def do_test():
         print(err)
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         os.remove(conf_file)
         try:
             os.remove(f"{port}.sock")

test/broker/01-connect-windows-line-endings.py

@@ -36,7 +36,9 @@ def do_test():
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/01-connect-zero-length-id.py

@@ -52,7 +52,9 @@ def do_test(per_listener, proto_ver, clean_start, allow_zero, client_port, expec
         pass
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         os.remove(conf_file)
         if rc:

test/broker/02-shared-nolocal.py

@@ -30,7 +30,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-shared-qos0-v5.py

@@ -127,7 +127,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subhier-crash.py

@@ -49,7 +49,9 @@ def do_test(start_broker=True):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-b2c-topic-alias.py

@@ -80,7 +80,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-long-topic.py

@@ -36,7 +36,9 @@ def do_test(start_broker, topic, succeeds):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-oversize-payload.py

@@ -61,7 +61,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-queued-bytes.py

@@ -47,7 +47,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-retain-as-publish.py

@@ -48,7 +48,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-send-retain.py

@@ -71,7 +71,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-subscription-id.py

@@ -98,7 +98,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-topic-alias-unknown.py

@@ -32,7 +32,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos0-topic-alias.py

@@ -49,7 +49,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos1-message-expiry-retain.py

@@ -80,7 +80,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos1-message-expiry-will.py

@@ -61,7 +61,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos1-message-expiry.py

@@ -67,7 +67,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos1-nolocal.py

@@ -53,7 +53,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos1-oversize-payload.py

@@ -67,7 +67,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/02-subpub-qos1.py

@@ -40,7 +40,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos2-1322.py

@@ -137,7 +137,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos2-max-inflight-bytes.py

@@ -97,7 +97,9 @@ def do_test(proto_ver):
         for i in range(0, 12):
             helper(port)
             #pub = subprocess.Popen(['./02-subpub-qos2-receive-maximum-helper.py', str(port)], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-            #pub.wait()
+            #if mosq_test.wait_for_subprocess(pub):
+            #    print("pub not terminated")
+            #    if rc == 0: rc=1
             #(stdo, stde) = pub.communicate()
 
             mid += 1
@@ -187,7 +189,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             #print(stde.decode('utf-8'))

test/broker/02-subpub-qos2-pubrec-error.py

@@ -74,7 +74,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos2-receive-maximum-1.py

@@ -102,7 +102,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos2-receive-maximum-2.py

@@ -105,7 +105,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-qos2.py

@@ -50,7 +50,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subpub-recover-subscriptions.py

@@ -69,7 +69,9 @@ def do_test(proto_ver):
         print(err)
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/02-subscribe-dollar-v5.py

@@ -34,7 +34,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subscribe-invalid-utf8.py

@@ -37,7 +37,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subscribe-long-topic.py

@@ -35,7 +35,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/02-subscribe-persistence-flipflop.py

@@ -81,7 +81,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-pattern-matching.py

@@ -49,7 +49,9 @@ def pattern_test(sub_topic, pub_topic):
         pass
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/03-publish-b2c-disconnect-qos1.py

@@ -70,7 +70,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-b2c-disconnect-qos2.py

@@ -83,7 +83,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-b2c-qos1-len.py

@@ -52,7 +52,9 @@ def do_test(start_broker, test, puback_packet):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-b2c-qos2-len.py

@@ -60,7 +60,9 @@ def do_test(start_broker, test, pubrec_packet, pubcomp_packet):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-c2b-disconnect-qos2.py

@@ -72,7 +72,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-c2b-qos2-len.py

@@ -35,7 +35,9 @@ def do_test(start_broker, test, pubrel_packet):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-dollar-v5.py

@@ -41,7 +41,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-dollar.py

@@ -29,7 +29,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-invalid-utf8.py

@@ -37,7 +37,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-long-topic.py

@@ -36,7 +36,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-qos1-max-inflight-expire.py

@@ -80,7 +80,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/03-publish-qos1-max-inflight.py

@@ -39,7 +39,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/03-publish-qos1-no-subscribers-v5.py

@@ -66,7 +66,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-qos1-retain-disabled.py

@@ -43,7 +43,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/03-publish-qos1.py

@@ -33,7 +33,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/03-publish-qos2-max-inflight-exceeded.py

@@ -36,7 +36,9 @@ def do_test(proto_ver):
         pass
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/03-publish-qos2-max-inflight.py

@@ -44,7 +44,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/03-publish-qos2-reuse-mid.py

@@ -47,7 +47,9 @@ def do_test(proto_ver):
         pass
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/03-publish-qos2.py

@@ -32,7 +32,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/04-retain-check-source-persist-diff-port.py

@@ -80,7 +80,9 @@ def do_test(proto_ver, per_listener, username):
         # Remove "write" ability
         write_acl_2(acl_file, username)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         if os.path.isfile(persistence_file) == False:
             raise FileNotFoundError("Persistence file not written")
 
@@ -97,7 +99,9 @@ def do_test(proto_ver, per_listener, username):
         pass
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         os.remove(conf_file)
         os.remove(acl_file)
         try:

test/broker/04-retain-check-source-persist.py

@@ -67,7 +67,9 @@ def do_test(proto_ver, per_listener, username):
         # Remove "write" ability
         write_acl_2(acl_file, username)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
 
         broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port)
 
@@ -82,7 +84,9 @@ def do_test(proto_ver, per_listener, username):
         pass
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         os.remove(conf_file)
         os.remove(acl_file)
         os.remove(persistence_file)

test/broker/04-retain-check-source.py

@@ -69,7 +69,9 @@ def do_test(proto_ver, per_listener):
         os.remove(conf_file)
         os.remove(acl_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/04-retain-qos0-clear.py

@@ -56,7 +56,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/04-retain-qos0-fresh.py

@@ -35,7 +35,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/04-retain-qos0-repeated.py

@@ -42,7 +42,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/04-retain-qos0.py

@@ -33,7 +33,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/04-retain-qos1-qos0.py

@@ -41,7 +41,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/04-retain-upgrade-outgoing-qos.py

@@ -45,7 +45,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/05-clean-session-qos1.py

@@ -65,7 +65,9 @@ def do_test(start_broker, proto_ver):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/05-session-expiry-v5.py

@@ -95,7 +95,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/06-bridge-b2br-disconnect-qos1.py

@@ -105,7 +105,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-b2br-disconnect-qos2.py

@@ -120,7 +120,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-b2br-late-connection-retain.py

@@ -70,7 +70,9 @@ def do_test(proto_ver):
         client.close()
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
 
         # Restart, with retained message in place
         write_config2(conf_file, persistence_file, port1, port2, bridge_protocol)
@@ -101,7 +103,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         os.remove(persistence_file)
         ssock.close()

test/broker/06-bridge-b2br-late-connection.py

@@ -75,7 +75,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-b2br-remapping.py

@@ -144,7 +144,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-br2b-disconnect-qos1.py

@@ -108,7 +108,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-br2b-disconnect-qos2.py

@@ -136,7 +136,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-br2b-remapping.py

@@ -122,7 +122,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-clean-session-core.py

@@ -141,6 +141,7 @@ def do_test(proto_ver, cs, lcs=None):
     pub_b3r = make_pub("br_in/test-queued3", mid=2, proto=proto_ver) # without queueing, there is no b2
 
     success = False
+    broker_termination_success = True
     stde_a1 = stde_b1 = None
     try:
         # b must start first, as it's the destination of a
@@ -162,7 +163,9 @@ def do_test(proto_ver, cs, lcs=None):
         tprint("Normal bi-dir bridging works. continuing")
 
         broker_b.terminate()
-        broker_b.wait()
+        if mosq_test.wait_for_subprocess(broker_b):
+            print("broker_b not terminated")
+            broker_termination_success = False
         (stdo_b1, stde_b1) = broker_b.communicate()
 
         # as we're _terminating_ the connections should close ~straight away
@@ -197,7 +200,9 @@ def do_test(proto_ver, cs, lcs=None):
 
         # ok, now repeat in the other direction...
         broker_a.terminate()
-        broker_a.wait()
+        if mosq_test.wait_for_subprocess(broker_a):
+            print("broker_a not terminated")
+            broker_termination_success = False
         (stdo_a1, stde_a1) = broker_a.communicate()
         time.sleep(0.5)
 
@@ -221,7 +226,7 @@ def do_test(proto_ver, cs, lcs=None):
             tprint("not expecting message b->a_2")
             mosq_test.do_receive_send(client_a, pub_b3r.p, pub_b3r.ack, "b->a_3(r)")
 
-        success = True
+        success = broker_termination_success
 
     except mosq_test.TestError:
         pass
@@ -230,8 +235,12 @@ def do_test(proto_ver, cs, lcs=None):
         os.remove(conf_file_b)
         broker_a.terminate()
         broker_b.terminate()
-        broker_a.wait()
-        broker_b.wait()
+        if mosq_test.wait_for_subprocess(broker_a):
+            print("broker_a not terminated")
+            success = False
+        if mosq_test.wait_for_subprocess(broker_b):
+            print("broker_b not terminated")
+            success = False
         (stdo_a, stde_a) = broker_a.communicate()
         (stdo_b, stde_b) = broker_b.communicate()
         # Must be after terminating!

test/broker/06-bridge-config-reload.py

@@ -101,7 +101,9 @@ def do_test():
     finally:
         try:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             _, stde = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/06-bridge-fail-persist-resend-qos1.py

@@ -89,7 +89,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         sock.close()
         if rc:

test/broker/06-bridge-fail-persist-resend-qos2.py

@@ -101,7 +101,9 @@ def do_test(proto_ver):
     finally:
         os.remove(conf_file)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         sock.close()
         if rc:

test/broker/06-bridge-no-local.py

@@ -35,7 +35,9 @@ def do_test(start_broker, proto_ver_connect, proto_ver_msgs, sub_opts):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/06-bridge-outgoing-retain.py

@@ -95,7 +95,9 @@ def do_test(proto_ver, outgoing_retain):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-per-listener-settings.py

@@ -141,7 +141,9 @@ def do_test(proto_ver):
             pass
 
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         ssock.close()
         if rc:

test/broker/06-bridge-reconnect-local-out.py

@@ -55,7 +55,9 @@ def do_test(proto_ver):
     else:
         time.sleep(0.5)
     local_broker.terminate()
-    local_broker.wait()
+    if mosq_test.wait_for_subprocess(local_broker):
+        print("local_broker not terminated")
+        if rc == 0: rc=1
     if os.environ.get('MOSQ_USE_VALGRIND') is not None:
         time.sleep(5)
     else:
@@ -95,12 +97,16 @@ def do_test(proto_ver):
         os.remove(conf_file)
         time.sleep(1)
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))
         local_broker.terminate()
-        local_broker.wait()
+        if mosq_test.wait_for_subprocess(local_broker):
+            print("local_broker not terminated")
+            if rc == 0: rc=1
         try:
             os.remove('mosquitto-%d.db' % (port1))
         except OSError:

test/broker/07-will-delay-invalid-573191.py

@@ -22,7 +22,9 @@ def do_test():
         rc = 0
     finally:
         broker.terminate()
-        broker.wait()
+        if mosq_test.wait_for_subprocess(broker):
+            print("broker not terminated")
+            if rc == 0: rc=1
         (stdo, stde) = broker.communicate()
         if rc:
             print(stde.decode('utf-8'))

test/broker/07-will-delay-reconnect.py

@@ -54,7 +54,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/07-will-delay-recover.py

@@ -57,7 +57,9 @@ def do_test(start_broker, clean_session):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/07-will-delay-session-expiry.py

@@ -48,7 +48,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/07-will-delay-session-expiry2.py

@@ -48,7 +48,9 @@ def do_test(start_broker):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))

test/broker/07-will-delay.py

@@ -44,7 +44,9 @@ def do_test(start_broker, clean_session):
     finally:
         if start_broker:
             broker.terminate()
-            broker.wait()
+            if mosq_test.wait_for_subprocess(broker):
+                print("broker not terminated")
+                if rc == 0: rc=1
             (stdo, stde) = broker.communicate()
             if rc:
                 print(stde.decode('utf-8'))