Use helpers in all tests.

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

@@ -2,15 +2,7 @@
 
 # Does a bridge queue up retained messages correctly if the remote broker starts up late?
 
-import socket
-
-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_config1(filename, persistence_file, port1, port2):
     with open(filename, 'w') as f:

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

@@ -2,15 +2,7 @@
 
 # Does a bridge queue up messages correctly if the remote broker starts up late?
 
-import socket
-
-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, port1, port2):
     with open(filename, 'w') as f:

test/broker/09-acl-access-variants.py

@@ -2,15 +2,7 @@
 
 # Check access
 
-
-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 signal
+from mosq_test_helper import *
 
 def write_config(filename, port, per_listener):
     with open(filename, 'w') as f: