Update merged tests.

test/broker/02-subpub-qos1-bad-pubcomp.py

@@ -2,14 +2,7 @@
 
 # Test what the broker does if receiving a PUBCOMP in response to a QoS 1 PUBLISH.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
-import time
+from mosq_test_helper import *
 
 rc = 1
 keepalive = 60

test/broker/02-subpub-qos1-bad-pubrec.py

@@ -2,14 +2,7 @@
 
 # Test what the broker does if receiving a PUBREC in response to a QoS 1 PUBLISH.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
-import time
+from mosq_test_helper import *
 
 rc = 1
 keepalive = 60

test/broker/02-subpub-qos2-bad-puback-1.py

@@ -2,14 +2,7 @@
 
 # Test what the broker does if receiving a PUBACK in response to a QoS 2 PUBLISH.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
-import time
+from mosq_test_helper import *
 
 rc = 1
 keepalive = 60

test/broker/02-subpub-qos2-bad-puback-2.py

@@ -2,14 +2,7 @@
 
 # Test what the broker does if receiving a PUBACK in response to a QoS 2 PUBREL.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
-import time
+from mosq_test_helper import *
 
 rc = 1
 keepalive = 60

test/broker/02-subpub-qos2-bad-pubcomp.py

@@ -2,14 +2,7 @@
 
 # Test what the broker does if receiving a PUBCOMP in response to a QoS 2 PUBLISH.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
-import time
+from mosq_test_helper import *
 
 rc = 1
 keepalive = 60

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

@@ -2,13 +2,7 @@
 
 # Test for CVE-2018-12546, with the broker being stopped to write the persistence file, plus subscriber on different port.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
+from mosq_test_helper import *
 import signal
 
 def write_config(filename, port1, port2, per_listener):

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

@@ -2,13 +2,7 @@
 
 # Test for CVE-2018-12546, with the broker being stopped to write the persistence file.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
+from mosq_test_helper import *
 import signal
 
 def write_config(filename, port, per_listener):

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

@@ -2,13 +2,7 @@
 
 # Test for CVE-2018-12546
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
+from mosq_test_helper import *
 import signal
 
 def write_config(filename, port, per_listener):

test/broker/09-acl-empty-file.py

@@ -2,13 +2,7 @@
 
 # Test for CVE-2018-xxxxx
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
+from mosq_test_helper import *
 import signal
 
 def write_config(filename, port, per_listener):

test/broker/09-plugin-auth-acl-sub-denied.py

@@ -4,13 +4,7 @@
 # produces the correct response, and check the client isn't disconnected (ref:
 # issue #1016).
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
+from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:

test/broker/09-pwfile-parse-invalid.py

@@ -2,13 +2,7 @@
 
 # Test for CVE-2018-xxxxx.
 
-import inspect, os, sys
-# From http://stackoverflow.com/questions/279237/python-import-a-module-from-a-folder
-cmd_subfolder = os.path.realpath(os.path.abspath(os.path.join(os.path.split(inspect.getfile( inspect.currentframe() ))[0],"..")))
-if cmd_subfolder not in sys.path:
-    sys.path.insert(0, cmd_subfolder)
-
-import mosq_test
+from mosq_test_helper import *
 import signal
 
 def write_config(filename, port, per_listener):