From 8cd2411ab6fbe705f2c26f9729c82460f669a946 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Wed, 28 Jul 2021 14:20:01 +0100 Subject: [PATCH] Tests should typically use `listener` instead of `port`. --- test/broker/01-connect-uname-no-password-denied.py | 2 +- .../broker/01-connect-uname-password-denied-no-will.py | 2 +- test/broker/01-connect-uname-password-denied.py | 2 +- .../broker/01-connect-uname-password-success-no-tls.py | 2 +- test/broker/03-publish-qos1-max-inflight-expire.py | 2 +- test/broker/03-publish-qos1-max-inflight.py | 2 +- test/broker/03-publish-qos2-max-inflight.py | 2 +- .../broker/04-retain-check-source-persist-diff-port.py | 2 +- test/broker/04-retain-check-source-persist.py | 2 +- test/broker/04-retain-check-source.py | 2 +- test/broker/04-retain-upgrade-outgoing-qos.py | 2 +- test/broker/06-bridge-b2br-disconnect-qos1.py | 2 +- test/broker/06-bridge-b2br-disconnect-qos2.py | 2 +- test/broker/06-bridge-b2br-late-connection-retain.py | 4 ++-- test/broker/06-bridge-b2br-late-connection.py | 2 +- test/broker/06-bridge-b2br-remapping.py | 2 +- test/broker/06-bridge-br2b-disconnect-qos1.py | 2 +- test/broker/06-bridge-br2b-disconnect-qos2.py | 2 +- test/broker/06-bridge-br2b-remapping.py | 2 +- test/broker/06-bridge-clean-session.py | 4 ++-- test/broker/06-bridge-fail-persist-resend-qos1.py | 2 +- test/broker/06-bridge-fail-persist-resend-qos2.py | 2 +- test/broker/06-bridge-outgoing-retain.py | 2 +- test/broker/06-bridge-per-listener-settings.py | 10 +++++----- test/broker/06-bridge-reconnect-local-out.py | 2 +- test/broker/08-ssl-bridge.py | 2 +- test/broker/08-ssl-connect-cert-auth-crl.py | 2 +- test/broker/08-ssl-connect-cert-auth-expired.py | 2 +- test/broker/08-ssl-connect-cert-auth-revoked.py | 2 +- test/broker/08-ssl-connect-cert-auth-without.py | 2 +- test/broker/08-ssl-connect-cert-auth.py | 2 +- test/broker/08-ssl-connect-identity.py | 2 +- test/broker/08-ssl-connect-no-auth-wrong-ca.py | 2 +- test/broker/08-ssl-connect-no-auth.py | 2 +- test/broker/08-ssl-connect-no-identity.py | 2 +- test/broker/08-tls-psk-bridge.py | 4 ++-- test/broker/08-tls-psk-pub.py | 2 +- test/broker/09-acl-access-variants.py | 2 +- test/broker/09-acl-change.py | 2 +- test/broker/09-acl-empty-file.py | 2 +- test/broker/09-extended-auth-change-username.py | 2 +- test/broker/09-extended-auth-multistep-reauth.py | 2 +- test/broker/09-extended-auth-multistep.py | 2 +- test/broker/09-extended-auth-single.py | 2 +- test/broker/09-extended-auth-single2.py | 2 +- test/broker/09-plugin-auth-acl-pub.py | 2 +- test/broker/09-plugin-auth-acl-sub-denied.py | 2 +- test/broker/09-plugin-auth-acl-sub.py | 2 +- test/broker/09-plugin-auth-context-params.py | 2 +- test/broker/09-plugin-auth-defer-unpwd-fail.py | 2 +- test/broker/09-plugin-auth-defer-unpwd-success.py | 2 +- test/broker/09-plugin-auth-msg-params.py | 2 +- test/broker/09-plugin-auth-unpwd-fail.py | 2 +- test/broker/09-plugin-auth-unpwd-success.py | 2 +- test/broker/09-plugin-auth-v2-unpwd-fail.py | 2 +- test/broker/09-plugin-auth-v2-unpwd-success.py | 2 +- test/broker/09-plugin-publish.py | 2 +- test/broker/09-pwfile-parse-invalid.py | 2 +- test/broker/10-listener-mount-point.py | 2 +- test/broker/11-message-expiry.py | 2 +- test/broker/11-persistent-subscription-no-local.py | 2 +- test/broker/11-persistent-subscription-v5.py | 2 +- test/broker/11-persistent-subscription.py | 2 +- test/broker/11-pub-props.py | 2 +- test/broker/11-subscription-id.py | 2 +- test/broker/12-prop-maximum-packet-size-broker.py | 2 +- test/broker/12-prop-server-keepalive.py | 2 +- test/broker/test.py | 2 +- 68 files changed, 75 insertions(+), 75 deletions(-) diff --git a/test/broker/01-connect-uname-no-password-denied.py b/test/broker/01-connect-uname-no-password-denied.py index b5382405..ff34f54f 100755 --- a/test/broker/01-connect-uname-no-password-denied.py +++ b/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") diff --git a/test/broker/01-connect-uname-password-denied-no-will.py b/test/broker/01-connect-uname-password-denied-no-will.py index a9ce214e..c63f7dff 100755 --- a/test/broker/01-connect-uname-password-denied-no-will.py +++ b/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") diff --git a/test/broker/01-connect-uname-password-denied.py b/test/broker/01-connect-uname-password-denied.py index 989d5789..26b105a8 100755 --- a/test/broker/01-connect-uname-password-denied.py +++ b/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") diff --git a/test/broker/01-connect-uname-password-success-no-tls.py b/test/broker/01-connect-uname-password-success-no-tls.py index 27c09c11..179ae940 100755 --- a/test/broker/01-connect-uname-password-success-no-tls.py +++ b/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") diff --git a/test/broker/03-publish-qos1-max-inflight-expire.py b/test/broker/03-publish-qos1-max-inflight-expire.py index 54cb06a2..fad58146 100755 --- a/test/broker/03-publish-qos1-max-inflight-expire.py +++ b/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") diff --git a/test/broker/03-publish-qos1-max-inflight.py b/test/broker/03-publish-qos1-max-inflight.py index dbc51af9..38435906 100755 --- a/test/broker/03-publish-qos1-max-inflight.py +++ b/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") diff --git a/test/broker/03-publish-qos2-max-inflight.py b/test/broker/03-publish-qos2-max-inflight.py index 92cdbd65..7c3d72a6 100755 --- a/test/broker/03-publish-qos2-max-inflight.py +++ b/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") diff --git a/test/broker/04-retain-check-source-persist-diff-port.py b/test/broker/04-retain-check-source-persist-diff-port.py index efe1cfba..62036f2a 100755 --- a/test/broker/04-retain-check-source-persist-diff-port.py +++ b/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") diff --git a/test/broker/04-retain-check-source-persist.py b/test/broker/04-retain-check-source-persist.py index 9e594415..05d3bda7 100755 --- a/test/broker/04-retain-check-source-persist.py +++ b/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") diff --git a/test/broker/04-retain-check-source.py b/test/broker/04-retain-check-source.py index 5a7ed298..dc5409a4 100755 --- a/test/broker/04-retain-check-source.py +++ b/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'))) diff --git a/test/broker/04-retain-upgrade-outgoing-qos.py b/test/broker/04-retain-upgrade-outgoing-qos.py index e2720bcf..7362a341 100755 --- a/test/broker/04-retain-upgrade-outgoing-qos.py +++ b/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") diff --git a/test/broker/06-bridge-b2br-disconnect-qos1.py b/test/broker/06-bridge-b2br-disconnect-qos1.py index 5cd00b46..e7ef8b74 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos1.py +++ b/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)) diff --git a/test/broker/06-bridge-b2br-disconnect-qos2.py b/test/broker/06-bridge-b2br-disconnect-qos2.py index 7c84d3c8..71f5fbbd 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos2.py +++ b/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)) diff --git a/test/broker/06-bridge-b2br-late-connection-retain.py b/test/broker/06-bridge-b2br-late-connection-retain.py index b3a4648e..d5d76a87 100755 --- a/test/broker/06-bridge-b2br-late-connection-retain.py +++ b/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") diff --git a/test/broker/06-bridge-b2br-late-connection.py b/test/broker/06-bridge-b2br-late-connection.py index 9cfa3d07..903f78c0 100755 --- a/test/broker/06-bridge-b2br-late-connection.py +++ b/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") diff --git a/test/broker/06-bridge-b2br-remapping.py b/test/broker/06-bridge-b2br-remapping.py index 80211983..05a42a68 100755 --- a/test/broker/06-bridge-b2br-remapping.py +++ b/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") diff --git a/test/broker/06-bridge-br2b-disconnect-qos1.py b/test/broker/06-bridge-br2b-disconnect-qos1.py index 2eda998f..df94fa67 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos1.py +++ b/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") diff --git a/test/broker/06-bridge-br2b-disconnect-qos2.py b/test/broker/06-bridge-br2b-disconnect-qos2.py index d6d7358c..453fe083 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos2.py +++ b/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") diff --git a/test/broker/06-bridge-br2b-remapping.py b/test/broker/06-bridge-br2b-remapping.py index be7a5c3f..287636d9 100755 --- a/test/broker/06-bridge-br2b-remapping.py +++ b/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") diff --git a/test/broker/06-bridge-clean-session.py b/test/broker/06-bridge-clean-session.py index 55190442..8e04593b 100755 --- a/test/broker/06-bridge-clean-session.py +++ b/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") diff --git a/test/broker/06-bridge-fail-persist-resend-qos1.py b/test/broker/06-bridge-fail-persist-resend-qos1.py index deba1057..5f09f66e 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos1.py +++ b/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") diff --git a/test/broker/06-bridge-fail-persist-resend-qos2.py b/test/broker/06-bridge-fail-persist-resend-qos2.py index 6b695862..032298ab 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos2.py +++ b/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") diff --git a/test/broker/06-bridge-outgoing-retain.py b/test/broker/06-bridge-outgoing-retain.py index 242d682d..da863662 100755 --- a/test/broker/06-bridge-outgoing-retain.py +++ b/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") diff --git a/test/broker/06-bridge-per-listener-settings.py b/test/broker/06-bridge-per-listener-settings.py index 2dcf1216..8c5b92b9 100755 --- a/test/broker/06-bridge-per-listener-settings.py +++ b/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 diff --git a/test/broker/06-bridge-reconnect-local-out.py b/test/broker/06-bridge-reconnect-local-out.py index 470d12ff..6533dec9 100755 --- a/test/broker/06-bridge-reconnect-local-out.py +++ b/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") diff --git a/test/broker/08-ssl-bridge.py b/test/broker/08-ssl-bridge.py index c48e7de0..a4e0d1a1 100755 --- a/test/broker/08-ssl-bridge.py +++ b/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") diff --git a/test/broker/08-ssl-connect-cert-auth-crl.py b/test/broker/08-ssl-connect-cert-auth-crl.py index 6c348a35..6868ad12 100755 --- a/test/broker/08-ssl-connect-cert-auth-crl.py +++ b/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") diff --git a/test/broker/08-ssl-connect-cert-auth-expired.py b/test/broker/08-ssl-connect-cert-auth-expired.py index c7be02a4..fe693f2e 100755 --- a/test/broker/08-ssl-connect-cert-auth-expired.py +++ b/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") diff --git a/test/broker/08-ssl-connect-cert-auth-revoked.py b/test/broker/08-ssl-connect-cert-auth-revoked.py index 76788bc7..22f47596 100755 --- a/test/broker/08-ssl-connect-cert-auth-revoked.py +++ b/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") diff --git a/test/broker/08-ssl-connect-cert-auth-without.py b/test/broker/08-ssl-connect-cert-auth-without.py index 932dee29..08e2a1a1 100755 --- a/test/broker/08-ssl-connect-cert-auth-without.py +++ b/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") diff --git a/test/broker/08-ssl-connect-cert-auth.py b/test/broker/08-ssl-connect-cert-auth.py index bf7c67bb..1cf8ed74 100755 --- a/test/broker/08-ssl-connect-cert-auth.py +++ b/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") diff --git a/test/broker/08-ssl-connect-identity.py b/test/broker/08-ssl-connect-identity.py index f1bc53d3..2bbd8cfe 100755 --- a/test/broker/08-ssl-connect-identity.py +++ b/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") diff --git a/test/broker/08-ssl-connect-no-auth-wrong-ca.py b/test/broker/08-ssl-connect-no-auth-wrong-ca.py index 30e3e313..933eb19a 100755 --- a/test/broker/08-ssl-connect-no-auth-wrong-ca.py +++ b/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") diff --git a/test/broker/08-ssl-connect-no-auth.py b/test/broker/08-ssl-connect-no-auth.py index 8990afeb..6de58d43 100755 --- a/test/broker/08-ssl-connect-no-auth.py +++ b/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)) diff --git a/test/broker/08-ssl-connect-no-identity.py b/test/broker/08-ssl-connect-no-identity.py index fcb8f4fc..998cd7c7 100755 --- a/test/broker/08-ssl-connect-no-identity.py +++ b/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") diff --git a/test/broker/08-tls-psk-bridge.py b/test/broker/08-tls-psk-bridge.py index 56d3c196..a101d97f 100755 --- a/test/broker/08-tls-psk-bridge.py +++ b/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") diff --git a/test/broker/08-tls-psk-pub.py b/test/broker/08-tls-psk-pub.py index 99d5b34b..13cf0a4c 100755 --- a/test/broker/08-tls-psk-pub.py +++ b/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)) diff --git a/test/broker/09-acl-access-variants.py b/test/broker/09-acl-access-variants.py index 5cb71e48..f0b593c3 100755 --- a/test/broker/09-acl-access-variants.py +++ b/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'))) diff --git a/test/broker/09-acl-change.py b/test/broker/09-acl-change.py index c85618a2..ca45d2ac 100755 --- a/test/broker/09-acl-change.py +++ b/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'))) diff --git a/test/broker/09-acl-empty-file.py b/test/broker/09-acl-empty-file.py index a36f1483..1e70a441 100755 --- a/test/broker/09-acl-empty-file.py +++ b/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'))) diff --git a/test/broker/09-extended-auth-change-username.py b/test/broker/09-extended-auth-change-username.py index afcb5f36..d070ddab 100755 --- a/test/broker/09-extended-auth-change-username.py +++ b/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") diff --git a/test/broker/09-extended-auth-multistep-reauth.py b/test/broker/09-extended-auth-multistep-reauth.py index fb55c9e1..665b13b8 100755 --- a/test/broker/09-extended-auth-multistep-reauth.py +++ b/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") diff --git a/test/broker/09-extended-auth-multistep.py b/test/broker/09-extended-auth-multistep.py index 3b19f43c..3abc00cf 100755 --- a/test/broker/09-extended-auth-multistep.py +++ b/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() diff --git a/test/broker/09-extended-auth-single.py b/test/broker/09-extended-auth-single.py index 57b21491..0b88386f 100755 --- a/test/broker/09-extended-auth-single.py +++ b/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() diff --git a/test/broker/09-extended-auth-single2.py b/test/broker/09-extended-auth-single2.py index 8853c169..2a1e5d38 100755 --- a/test/broker/09-extended-auth-single2.py +++ b/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") diff --git a/test/broker/09-plugin-auth-acl-pub.py b/test/broker/09-plugin-auth-acl-pub.py index 5241d4d3..70e16cf1 100755 --- a/test/broker/09-plugin-auth-acl-pub.py +++ b/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") diff --git a/test/broker/09-plugin-auth-acl-sub-denied.py b/test/broker/09-plugin-auth-acl-sub-denied.py index 24447848..7fd311c1 100755 --- a/test/broker/09-plugin-auth-acl-sub-denied.py +++ b/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") diff --git a/test/broker/09-plugin-auth-acl-sub.py b/test/broker/09-plugin-auth-acl-sub.py index ec34b19b..e88e4fb2 100755 --- a/test/broker/09-plugin-auth-acl-sub.py +++ b/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") diff --git a/test/broker/09-plugin-auth-context-params.py b/test/broker/09-plugin-auth-context-params.py index 5614a868..6bc6fdb5 100755 --- a/test/broker/09-plugin-auth-context-params.py +++ b/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") diff --git a/test/broker/09-plugin-auth-defer-unpwd-fail.py b/test/broker/09-plugin-auth-defer-unpwd-fail.py index c2d932e4..fa2486be 100755 --- a/test/broker/09-plugin-auth-defer-unpwd-fail.py +++ b/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") diff --git a/test/broker/09-plugin-auth-defer-unpwd-success.py b/test/broker/09-plugin-auth-defer-unpwd-success.py index 246f421c..6dada80c 100755 --- a/test/broker/09-plugin-auth-defer-unpwd-success.py +++ b/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") diff --git a/test/broker/09-plugin-auth-msg-params.py b/test/broker/09-plugin-auth-msg-params.py index c3ea31cf..5a856b73 100755 --- a/test/broker/09-plugin-auth-msg-params.py +++ b/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") diff --git a/test/broker/09-plugin-auth-unpwd-fail.py b/test/broker/09-plugin-auth-unpwd-fail.py index 1aa6599f..47f17a65 100755 --- a/test/broker/09-plugin-auth-unpwd-fail.py +++ b/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") diff --git a/test/broker/09-plugin-auth-unpwd-success.py b/test/broker/09-plugin-auth-unpwd-success.py index 64192c5b..af3ba864 100755 --- a/test/broker/09-plugin-auth-unpwd-success.py +++ b/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") diff --git a/test/broker/09-plugin-auth-v2-unpwd-fail.py b/test/broker/09-plugin-auth-v2-unpwd-fail.py index c5240f4e..351d658d 100755 --- a/test/broker/09-plugin-auth-v2-unpwd-fail.py +++ b/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") diff --git a/test/broker/09-plugin-auth-v2-unpwd-success.py b/test/broker/09-plugin-auth-v2-unpwd-success.py index 4b36c142..8abc5d1b 100755 --- a/test/broker/09-plugin-auth-v2-unpwd-success.py +++ b/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") diff --git a/test/broker/09-plugin-publish.py b/test/broker/09-plugin-publish.py index 83d84c83..1fb03422 100755 --- a/test/broker/09-plugin-publish.py +++ b/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") diff --git a/test/broker/09-pwfile-parse-invalid.py b/test/broker/09-pwfile-parse-invalid.py index 0c4d05b9..b5600a6c 100755 --- a/test/broker/09-pwfile-parse-invalid.py +++ b/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") diff --git a/test/broker/10-listener-mount-point.py b/test/broker/10-listener-mount-point.py index 12234498..776c7ef4 100755 --- a/test/broker/10-listener-mount-point.py +++ b/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)) diff --git a/test/broker/11-message-expiry.py b/test/broker/11-message-expiry.py index 6523e827..186866ea 100755 --- a/test/broker/11-message-expiry.py +++ b/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)) diff --git a/test/broker/11-persistent-subscription-no-local.py b/test/broker/11-persistent-subscription-no-local.py index 350ba5ca..7512922f 100755 --- a/test/broker/11-persistent-subscription-no-local.py +++ b/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)) diff --git a/test/broker/11-persistent-subscription-v5.py b/test/broker/11-persistent-subscription-v5.py index 7cd9ae6a..68a7120d 100755 --- a/test/broker/11-persistent-subscription-v5.py +++ b/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)) diff --git a/test/broker/11-persistent-subscription.py b/test/broker/11-persistent-subscription.py index 2ec2871c..bf650f7e 100755 --- a/test/broker/11-persistent-subscription.py +++ b/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)) diff --git a/test/broker/11-pub-props.py b/test/broker/11-pub-props.py index 1b76fa25..1785b5e4 100755 --- a/test/broker/11-pub-props.py +++ b/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)) diff --git a/test/broker/11-subscription-id.py b/test/broker/11-subscription-id.py index ed178425..fe2e4c2f 100755 --- a/test/broker/11-subscription-id.py +++ b/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)) diff --git a/test/broker/12-prop-maximum-packet-size-broker.py b/test/broker/12-prop-maximum-packet-size-broker.py index d3bf020f..625b3d23 100755 --- a/test/broker/12-prop-maximum-packet-size-broker.py +++ b/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") diff --git a/test/broker/12-prop-server-keepalive.py b/test/broker/12-prop-server-keepalive.py index 6a1db078..ecce56ae 100755 --- a/test/broker/12-prop-server-keepalive.py +++ b/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") diff --git a/test/broker/test.py b/test/broker/test.py index fd9d984b..ea11cecc 100755 --- a/test/broker/test.py +++ b/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'),