Tests should typically use `listener` instead of `port`.

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("password_file %s\n" % (filename.replace('.conf', '.pwfile')))
         f.write("allow_anonymous false\n")
 

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port, pw_file):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("password_file %s\n" % (pw_file))
         f.write("allow_anonymous false\n")
 

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("password_file %s\n" % (filename.replace('.conf', '.pwfile')))
         f.write("allow_anonymous false\n")
 

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("password_file %s\n" % (filename.replace('.conf', '.pwfile')))
         f.write("allow_anonymous false\n")
 

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("max_inflight_messages 1\n")
 

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("max_inflight_messages 1\n")
 

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("max_inflight_messages 1\n")
 

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

@@ -10,7 +10,7 @@ def write_config(filename, port1, port2, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
         f.write("check_retain_source true\n")
-        f.write("port %d\n" % (port1))
+        f.write("listener %d\n" % (port1))
         f.write("allow_anonymous true\n")
         f.write("acl_file %s\n" % (filename.replace('.conf', '.acl')))
         f.write("persistence true\n")

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

@@ -9,7 +9,7 @@ def write_config(filename, port, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
         f.write("check_retain_source true\n")
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("acl_file %s\n" % (filename.replace('.conf', '.acl')))
         f.write("persistence true\n")

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

@@ -9,7 +9,7 @@ def write_config(filename, port, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
         f.write("check_retain_source true\n")
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("acl_file %s\n" % (filename.replace('.conf', '.acl')))
 

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("upgrade_outgoing_qos true\n")
 

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("connection bridge_sample\n")
         f.write("address 127.0.0.1:%d\n" % (port1))

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("connection bridge_sample\n")
         f.write("address 127.0.0.1:%d\n" % (port1))

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config1(filename, persistence_file, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("persistence true\n")
@@ -14,7 +14,7 @@ def write_config1(filename, persistence_file, port1, port2):
 
 def write_config2(filename, persistence_file, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")

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

@@ -34,7 +34,7 @@ def tprint(*args, **kwargs):
 # this is our "A" broker
 def write_config_edge(filename, persistence_file, remote_port, listen_port, protocol_version, cs=False, lcs=None):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (listen_port))
+        f.write("listener %d\n" % (listen_port))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("persistence true\n")
@@ -59,7 +59,7 @@ def write_config_edge(filename, persistence_file, remote_port, listen_port, prot
 # this is our "B" broker
 def write_config_core(filename, listen_port, persistence_file):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (listen_port))
+        f.write("listener %d\n" % (listen_port))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("persistence true\n")

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("connection bridge-u-test\n")
         f.write("remote_clientid bridge-u-test\n")

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("connection bridge-u-test\n")
         f.write("remote_clientid bridge-u-test\n")

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version, outgoing_retain):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")

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

@@ -4,11 +4,11 @@
 
 from mosq_test_helper import *
 
-def write_config(filename, port1, port2, port3, protocol_version):
+def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
         f.write("per_listener_settings true\n")
-        f.write("port %d\n" % (port2))
-        f.write("listener %d 127.0.0.1\n" % (port3))
+        f.write("listener %d\n" % (port2))
+        f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_sample\n")
         f.write("address 127.0.0.1:%d\n" % (port1))
@@ -98,9 +98,9 @@ def do_test(proto_ver):
         bridge_protocol = "mqttv50"
         proto_ver_connect = 5
 
-    (port1, port2, port3) = mosq_test.get_port(3)
+    (port1, port2) = mosq_test.get_port(2)
     conf_file = os.path.basename(__file__).replace('.py', '.conf')
-    write_config(conf_file, port1, port2, port3, bridge_protocol)
+    write_config(conf_file, port1, port2, bridge_protocol)
 
     rc = 1
     keepalive = 60

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2, protocol_version):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("persistence true\n")

test/broker/08-ssl-bridge.py

@@ -4,7 +4,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge_test\n")

test/broker/08-ssl-connect-cert-auth-crl.py

@@ -8,7 +8,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("listener %d\n" % (port1))
         f.write("allow_anonymous true\n")

test/broker/08-ssl-connect-cert-auth-expired.py

@@ -11,7 +11,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("listener %d\n" % (port1))
         f.write("cafile ../ssl/all-ca.crt\n")

test/broker/08-ssl-connect-cert-auth-revoked.py

@@ -8,7 +8,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("listener %d\n" % (port1))
         f.write("allow_anonymous true\n")

test/broker/08-ssl-connect-cert-auth-without.py

@@ -10,7 +10,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("listener %d\n" % (port1))
         f.write("cafile ../ssl/all-ca.crt\n")
         f.write("certfile ../ssl/server.crt\n")

test/broker/08-ssl-connect-cert-auth.py

@@ -10,7 +10,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("listener %d\n" % (port1))
         f.write("allow_anonymous true\n")

test/broker/08-ssl-connect-identity.py

@@ -10,7 +10,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("listener %d\n" %(port1))
         f.write("cafile ../ssl/all-ca.crt\n")

test/broker/08-ssl-connect-no-auth-wrong-ca.py

@@ -10,7 +10,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("listener %d\n" % (port1))
         f.write("cafile ../ssl/all-ca.crt\n")

test/broker/08-ssl-connect-no-auth.py

@@ -10,7 +10,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("listener %d\n" % (port1))

test/broker/08-ssl-connect-no-identity.py

@@ -10,7 +10,7 @@ if sys.version < '2.7':
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port2))
+        f.write("listener %d\n" % (port2))
         f.write("\n")
         f.write("listener %d\n" % (port1))
         f.write("cafile ../ssl/all-ca.crt\n")

test/broker/08-tls-psk-bridge.py

@@ -12,14 +12,14 @@ def write_config1(filename, port1, port2):
         f.write("\n")
         f.write("psk_file 08-tls-psk-bridge.psk\n")
         f.write("\n")
-        f.write("port %d\n" % (port1))
+        f.write("listener %d\n" % (port1))
         f.write("\n")
         f.write("listener %d\n" % (port2))
         f.write("psk_hint hint\n")
 
 def write_config2(filename, port2, port3):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port3))
+        f.write("listener %d\n" % (port3))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("connection bridge-psk\n")

test/broker/08-tls-psk-pub.py

@@ -12,7 +12,7 @@ def write_config(filename, port1, port2):
         f.write("allow_anonymous true\n")
         f.write("psk_file 08-tls-psk-pub.psk\n")
         f.write("\n")
-        f.write("port %d\n" % (port1))
+        f.write("listener %d\n" % (port1))
         f.write("psk_hint hint\n")
         f.write("\n")
         f.write("listener %d\n" % (port2))

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

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 def write_config(filename, port, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("acl_file %s\n" % (filename.replace('.conf', '.acl')))
 

test/broker/09-acl-change.py

@@ -8,7 +8,7 @@ import signal
 def write_config(filename, port, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("acl_file %s\n" % (filename.replace('.conf', '.acl')))
 

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

@@ -8,7 +8,7 @@ import signal
 def write_config(filename, port, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("acl_file %s\n" % (filename.replace('.conf', '.acl')))
 

test/broker/09-extended-auth-change-username.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 def write_config(filename, acl_file, port, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("acl_file %s\n" % (acl_file))
         f.write("auth_plugin c/auth_plugin_extended_single.so\n")

test/broker/09-extended-auth-multistep-reauth.py

@@ -4,7 +4,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("auth_plugin c/auth_plugin_extended_multiple.so\n")
 

test/broker/09-extended-auth-multistep.py

@@ -4,7 +4,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_extended_multiple.so\n")
 
 port = mosq_test.get_port()

test/broker/09-extended-auth-single.py

@@ -12,7 +12,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_extended_single.so\n")
 
 port = mosq_test.get_port()

test/broker/09-extended-auth-single2.py

@@ -12,7 +12,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_extended_single.so\n")
         f.write("auth_plugin c/auth_plugin_extended_single2.so\n")
 

test/broker/09-plugin-auth-acl-pub.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port, plugin_ver):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v%d.so\n" % (plugin_ver))
         f.write("allow_anonymous false\n")
 

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

@@ -8,7 +8,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_acl_sub_denied.so\n")
         f.write("allow_anonymous false\n")
 

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

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port, plugin_ver):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v%d.so\n" % (plugin_ver))
         f.write("allow_anonymous false\n")
 

test/broker/09-plugin-auth-context-params.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_context_params.so\n")
         f.write("allow_anonymous false\n")
 

test/broker/09-plugin-auth-defer-unpwd-fail.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port, plugin_ver):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v%d.so\n" % (plugin_ver))
         f.write("allow_anonymous false\n")
 

test/broker/09-plugin-auth-defer-unpwd-success.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port, plugin_ver):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v%d.so\n" % (plugin_ver))
         f.write("auth_plugin c/auth_plugin_v2.so\n")
         f.write("allow_anonymous false\n")

test/broker/09-plugin-auth-msg-params.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_msg_params.so\n")
         f.write("allow_anonymous true\n")
 

test/broker/09-plugin-auth-unpwd-fail.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port, plugin_ver):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v%d.so\n" % (plugin_ver))
         f.write("allow_anonymous false\n")
 

test/broker/09-plugin-auth-unpwd-success.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port, plugin_ver):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v%d.so\n" % (plugin_ver))
         f.write("allow_anonymous false\n")
 

test/broker/09-plugin-auth-v2-unpwd-fail.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v2.so\n")
         f.write("allow_anonymous false\n")
 

test/broker/09-plugin-auth-v2-unpwd-success.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_v2.so\n")
         f.write("allow_anonymous false\n")
 

test/broker/09-plugin-publish.py

@@ -4,7 +4,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("auth_plugin c/auth_plugin_publish.so\n")
         f.write("allow_anonymous true\n")
 

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

@@ -8,7 +8,7 @@ import signal
 def write_config(filename, port, per_listener):
     with open(filename, 'w') as f:
         f.write("per_listener_settings %s\n" % (per_listener))
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("password_file %s\n" % (filename.replace('.conf', '.pwfile')))
         f.write("allow_anonymous false")
 

test/broker/10-listener-mount-point.py

@@ -4,7 +4,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port1, port2):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port1))
+        f.write("listener %d\n" % (port1))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("listener %d\n" % (port2))

test/broker/11-message-expiry.py

@@ -13,7 +13,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("persistence true\n")
         f.write("persistence_file mosquitto-%d.db\n" % (port))

test/broker/11-persistent-subscription-no-local.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("persistence true\n")
         f.write("persistence_file mosquitto-%d.db\n" % (port))

test/broker/11-persistent-subscription-v5.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("persistence true\n")
         f.write("persistence_file mosquitto-%d.db\n" % (port))

test/broker/11-persistent-subscription.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("persistence true\n")
         f.write("persistence_file mosquitto-%d.db\n" % (port))

test/broker/11-pub-props.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("persistence true\n")
         f.write("persistence_file mosquitto-%d.db\n" % (port))

test/broker/11-subscription-id.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("persistence true\n")
         f.write("persistence_file mosquitto-%d.db\n" % (port))

test/broker/12-prop-maximum-packet-size-broker.py

@@ -6,7 +6,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("max_packet_size 40\n")
 

test/broker/12-prop-server-keepalive.py

@@ -7,7 +7,7 @@ from mosq_test_helper import *
 
 def write_config(filename, port):
     with open(filename, 'w') as f:
-        f.write("port %d\n" % (port))
+        f.write("listener %d\n" % (port))
         f.write("allow_anonymous true\n")
         f.write("\n")
         f.write("max_keepalive 60\n")

test/broker/test.py

@@ -114,7 +114,7 @@ tests = [
     (2, './06-bridge-fail-persist-resend-qos2.py'),
     (1, './06-bridge-no-local.py'),
     (2, './06-bridge-outgoing-retain.py'),
-    (3, './06-bridge-per-listener-settings.py'),
+    (2, './06-bridge-per-listener-settings.py'),
     (2, './06-bridge-reconnect-local-out.py'),
     (2, './06-bridge-config-reload.py'),