From f6f5de34d696eec0824ef3d42e13abb883c04c05 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Fri, 17 Apr 2026 20:45:29 +0100 Subject: [PATCH] Tests: Use tempfile for broker logging to prevent stderr buffer filling --- test/apps/ctrl/ctrl-broker.py | 3 +-- test/apps/ctrl/ctrl-dynsec.py | 4 +++- test/broker/01-bad-initial-packets.py | 3 +-- test/broker/01-connect-575314.py | 3 +-- test/broker/01-connect-accept-protocol.py | 3 +-- test/broker/01-connect-allow-anonymous.py | 3 +-- test/broker/01-connect-auto-id.py | 3 +-- test/broker/01-connect-disconnect-v5.py | 3 +-- test/broker/01-connect-global-max-clients.py | 3 +-- .../01-connect-global-max-connections.py | 3 +-- .../01-connect-listener-allow-anonymous.py | 3 +-- test/broker/01-connect-max-connections.py | 3 +-- test/broker/01-connect-max-keepalive.py | 3 +-- test/broker/01-connect-take-over.py | 3 +-- .../01-connect-uname-no-password-denied.py | 3 +-- test/broker/01-connect-uname-or-anon.py | 3 +-- ...1-connect-uname-password-denied-no-will.py | 3 +-- .../01-connect-uname-password-denied.py | 3 +-- ...1-connect-uname-password-success-no-tls.py | 3 +-- test/broker/01-connect-unix-socket.py | 3 +-- .../broker/01-connect-windows-line-endings.py | 3 +-- test/broker/01-connect-zero-length-id.py | 3 +-- ...01-plugin-connect-uname-password-denied.py | 3 +-- test/broker/02-shared-nolocal.py | 3 +-- test/broker/02-shared-qos0-v5.py | 3 +-- test/broker/02-subhier-crash.py | 3 +-- test/broker/02-subpub-b2c-topic-alias.py | 3 +-- test/broker/02-subpub-qos0-long-topic.py | 3 +-- .../broker/02-subpub-qos0-oversize-payload.py | 3 +-- test/broker/02-subpub-qos0-queued-bytes.py | 3 +-- .../02-subpub-qos0-retain-as-publish.py | 3 +-- test/broker/02-subpub-qos0-send-retain.py | 3 +-- test/broker/02-subpub-qos0-subscription-id.py | 3 +-- .../02-subpub-qos0-topic-alias-unknown.py | 3 +-- test/broker/02-subpub-qos0-topic-alias.py | 3 +-- .../02-subpub-qos1-message-expiry-retain.py | 3 +-- .../02-subpub-qos1-message-expiry-will.py | 3 +-- test/broker/02-subpub-qos1-message-expiry.py | 3 +-- test/broker/02-subpub-qos1-nolocal.py | 3 +-- .../broker/02-subpub-qos1-oversize-payload.py | 3 +-- test/broker/02-subpub-qos1.py | 3 +-- test/broker/02-subpub-qos2-1322.py | 3 +-- .../02-subpub-qos2-max-inflight-bytes.py | 3 +-- test/broker/02-subpub-qos2-pubrec-error.py | 3 +-- .../02-subpub-qos2-receive-maximum-1.py | 3 +-- .../02-subpub-qos2-receive-maximum-2.py | 3 +-- test/broker/02-subpub-qos2.py | 3 +-- .../broker/02-subpub-recover-subscriptions.py | 3 +-- test/broker/02-subscribe-dollar-v5.py | 3 +-- test/broker/02-subscribe-invalid-utf8.py | 3 +-- test/broker/02-subscribe-long-topic.py | 3 +-- .../02-subscribe-persistence-flipflop.py | 3 +-- test/broker/03-pattern-matching.py | 4 +--- test/broker/03-publish-b2c-disconnect-qos1.py | 3 +-- test/broker/03-publish-b2c-disconnect-qos2.py | 3 +-- test/broker/03-publish-b2c-qos1-len.py | 3 +-- test/broker/03-publish-b2c-qos2-len.py | 3 +-- test/broker/03-publish-bad-flags.py | 3 +-- test/broker/03-publish-c2b-disconnect-qos2.py | 3 +-- test/broker/03-publish-c2b-qos2-len.py | 3 +-- test/broker/03-publish-dollar-v5.py | 3 +-- test/broker/03-publish-dollar.py | 3 +-- test/broker/03-publish-invalid-utf8.py | 3 +-- test/broker/03-publish-long-topic.py | 3 +-- .../03-publish-qos1-max-inflight-expire.py | 3 +-- test/broker/03-publish-qos1-max-inflight.py | 3 +-- .../03-publish-qos1-no-subscribers-v5.py | 3 +-- test/broker/03-publish-qos1-queued-bytes.py | 3 +-- .../broker/03-publish-qos1-retain-disabled.py | 3 +-- test/broker/03-publish-qos1.py | 3 +-- test/broker/03-publish-qos2-dup.py | 3 +-- .../03-publish-qos2-max-inflight-exceeded.py | 3 +-- test/broker/03-publish-qos2-max-inflight.py | 3 +-- test/broker/03-publish-qos2-reuse-mid.py | 3 +-- test/broker/03-publish-qos2.py | 3 +-- ...4-retain-check-source-persist-diff-port.py | 3 +-- test/broker/04-retain-check-source-persist.py | 3 +-- test/broker/04-retain-check-source.py | 3 +-- test/broker/04-retain-clear-multiple.py | 3 +-- test/broker/04-retain-qos0-clear.py | 3 +-- test/broker/04-retain-qos0-fresh.py | 3 +-- test/broker/04-retain-qos0-repeated.py | 3 +-- test/broker/04-retain-qos0.py | 3 +-- test/broker/04-retain-qos1-qos0.py | 3 +-- test/broker/04-retain-upgrade-outgoing-qos.py | 3 +-- test/broker/05-clean-session-qos1.py | 3 +-- test/broker/05-session-expiry-kick.py | 3 +-- test/broker/05-session-expiry-v5.py | 3 +-- test/broker/06-bridge-b2br-disconnect-qos1.py | 3 +-- test/broker/06-bridge-b2br-disconnect-qos2.py | 3 +-- .../06-bridge-b2br-late-connection-retain.py | 3 +-- test/broker/06-bridge-b2br-late-connection.py | 3 +-- test/broker/06-bridge-b2br-remapping.py | 3 +-- test/broker/06-bridge-br2b-disconnect-qos1.py | 3 +-- test/broker/06-bridge-br2b-disconnect-qos2.py | 3 +-- test/broker/06-bridge-br2b-remapping.py | 3 +-- test/broker/06-bridge-clean-session-core.py | 16 ++++++------- test/broker/06-bridge-config-reload.py | 3 +-- .../06-bridge-fail-persist-resend-qos1.py | 3 +-- .../06-bridge-fail-persist-resend-qos2.py | 3 +-- test/broker/06-bridge-no-local.py | 3 +-- test/broker/06-bridge-outgoing-retain.py | 3 +-- .../broker/06-bridge-per-listener-settings.py | 3 +-- test/broker/06-bridge-reconnect-local-out.py | 6 ++--- .../06-bridge-remap-receive-wildcard.py | 3 +-- test/broker/06-bridge-remote-shutdown.py | 4 ++-- test/broker/07-will-control.py | 3 +-- test/broker/07-will-delay-invalid-573191.py | 3 +-- test/broker/07-will-delay-reconnect.py | 3 +-- test/broker/07-will-delay-recover.py | 3 +-- test/broker/07-will-delay-session-expiry-0.py | 3 +-- test/broker/07-will-delay-session-expiry.py | 3 +-- test/broker/07-will-delay-session-expiry2.py | 3 +-- test/broker/07-will-delay.py | 3 +-- test/broker/07-will-disconnect-with-will.py | 3 +-- test/broker/07-will-invalid-utf8.py | 3 +-- test/broker/07-will-no-flag.py | 3 +-- test/broker/07-will-null-topic.py | 3 +-- test/broker/07-will-null.py | 3 +-- test/broker/07-will-oversize-payload.py | 3 +-- test/broker/07-will-per-listener.py | 3 +-- test/broker/07-will-properties.py | 3 +-- test/broker/07-will-qos0.py | 3 +-- test/broker/07-will-reconnect-1273.py | 3 +-- test/broker/07-will-takeover.py | 3 +-- test/broker/08-ssl-bridge.py | 3 +-- test/broker/08-ssl-connect-cert-auth-crl.py | 3 +-- ...8-ssl-connect-cert-auth-expired-allowed.py | 3 +-- .../08-ssl-connect-cert-auth-expired.py | 3 +-- .../08-ssl-connect-cert-auth-revoked.py | 3 +-- .../08-ssl-connect-cert-auth-without.py | 3 +-- test/broker/08-ssl-connect-cert-auth.py | 3 +-- test/broker/08-ssl-connect-dhparam.py | 3 +-- test/broker/08-ssl-connect-identity.py | 3 +-- .../broker/08-ssl-connect-no-auth-wrong-ca.py | 3 +-- test/broker/08-ssl-connect-no-auth.py | 3 +-- test/broker/08-ssl-connect-no-identity.py | 3 +-- test/broker/08-ssl-hup-disconnect.py | 3 +-- test/broker/08-tls-psk-bridge.py | 6 ++--- test/broker/08-tls-psk-pub.py | 3 +-- test/broker/09-acl-access-variants.py | 3 +-- test/broker/09-acl-change.py | 3 +-- test/broker/09-acl-empty-file.py | 3 +-- test/broker/09-auth-bad-method.py | 3 +-- .../09-extended-auth-change-username.py | 3 +-- .../09-extended-auth-multistep-reauth.py | 3 +-- test/broker/09-extended-auth-multistep.py | 3 +-- test/broker/09-extended-auth-reauth.py | 3 +-- test/broker/09-extended-auth-single.py | 3 +-- test/broker/09-extended-auth-single2.py | 3 +-- test/broker/09-plugin-acl-access-variants.py | 3 +-- test/broker/09-plugin-acl-change.py | 3 +-- test/broker/09-plugin-auth-acl-pub-prop.py | 3 +-- test/broker/09-plugin-auth-acl-pub.py | 3 +-- test/broker/09-plugin-auth-acl-sub-denied.py | 3 +-- test/broker/09-plugin-auth-acl-sub.py | 3 +-- test/broker/09-plugin-auth-context-params.py | 3 +-- .../broker/09-plugin-auth-defer-unpwd-fail.py | 3 +-- .../09-plugin-auth-defer-unpwd-success.py | 3 +-- test/broker/09-plugin-auth-msg-params.py | 3 +-- test/broker/09-plugin-auth-unpwd-fail.py | 3 +-- test/broker/09-plugin-auth-unpwd-success.py | 3 +-- test/broker/09-plugin-auth-v2-unpwd-fail.py | 3 +-- .../broker/09-plugin-auth-v2-unpwd-success.py | 3 +-- test/broker/09-plugin-auth-v3-unpwd-fail.py | 3 +-- .../broker/09-plugin-auth-v3-unpwd-success.py | 3 +-- test/broker/09-plugin-auth-v4-unpwd-fail.py | 3 +-- .../broker/09-plugin-auth-v4-unpwd-success.py | 3 +-- test/broker/09-plugin-auth-v5-unpwd-fail.py | 3 +-- .../broker/09-plugin-auth-v5-unpwd-success.py | 3 +-- test/broker/09-plugin-bad.py | 3 +-- test/broker/09-plugin-change-id.py | 3 +-- test/broker/09-plugin-delayed-auth.py | 3 +-- test/broker/09-plugin-evt-client-offline.py | 3 +-- test/broker/09-plugin-evt-message-in.py | 3 +-- test/broker/09-plugin-evt-message-out.py | 3 +-- test/broker/09-plugin-evt-psk-key.py | 3 +-- test/broker/09-plugin-evt-reload.py | 3 +-- test/broker/09-plugin-evt-subscribe.py | 3 +-- test/broker/09-plugin-evt-tick.py | 3 +-- test/broker/09-plugin-evt-unsubscribe.py | 3 +-- test/broker/09-plugin-load-acl.py | 3 +-- test/broker/09-plugin-load-basic-auth.py | 3 +-- test/broker/09-plugin-load-extended-auth.py | 3 +-- test/broker/09-plugin-publish.py | 3 +-- test/broker/09-plugin-unsupported.py | 3 +-- test/broker/10-listener-mount-point.py | 3 +-- test/broker/11-message-expiry.py | 3 +-- .../broker/11-persistence-autosave-changes.py | 3 +-- .../11-persistent-subscription-no-local.py | 3 +-- test/broker/11-persistent-subscription.py | 3 +-- test/broker/11-pub-props.py | 5 ++-- test/broker/11-subscription-id.py | 3 +-- .../12-prop-assigned-client-identifier.py | 3 +-- .../12-prop-maximum-packet-size-broker.py | 3 +-- ...2-prop-maximum-packet-size-publish-qos1.py | 3 +-- ...2-prop-maximum-packet-size-publish-qos2.py | 3 +-- ...12-prop-response-topic-correlation-data.py | 3 +-- test/broker/12-prop-response-topic.py | 3 +-- test/broker/12-prop-server-keepalive.py | 3 +-- test/broker/13-websocket-bad-origin.py | 3 +-- test/broker/14-dynsec-acl.py | 3 +-- test/broker/14-dynsec-allow-wildcard.py | 3 +-- test/broker/14-dynsec-anon-group.py | 3 +-- test/broker/14-dynsec-auth.py | 3 +-- test/broker/14-dynsec-client-invalid.py | 3 +-- test/broker/14-dynsec-client.py | 3 +-- test/broker/14-dynsec-config-init-env.py | 3 +-- test/broker/14-dynsec-config-init-file.py | 3 +-- test/broker/14-dynsec-config-init-random.py | 3 +-- test/broker/14-dynsec-default-access.py | 3 +-- test/broker/14-dynsec-disable-client.py | 3 +-- test/broker/14-dynsec-group-invalid.py | 3 +-- test/broker/14-dynsec-group.py | 3 +-- test/broker/14-dynsec-modify-client.py | 3 +-- test/broker/14-dynsec-modify-group.py | 3 +-- test/broker/14-dynsec-modify-role.py | 3 +-- test/broker/14-dynsec-plugin-invalid.py | 3 +-- test/broker/14-dynsec-role-invalid.py | 3 +-- test/broker/14-dynsec-role.py | 3 +-- test/broker/15-persist-bridge-queue.py | 10 ++++---- ...15-persist-client-drop-expired-messages.py | 3 +-- .../15-persist-client-expired-session.py | 3 +-- .../broker/15-persist-client-msg-in-v3-1-1.py | 3 +-- test/broker/15-persist-client-msg-in-v5-0.py | 3 +-- .../15-persist-client-msg-modify-acl.py | 3 +-- .../15-persist-client-msg-out-clear-v3-1-1.py | 3 +-- .../15-persist-client-msg-out-dup-v3-1-1.py | 3 +-- .../15-persist-client-msg-out-queue-v3-1-1.py | 3 +-- .../15-persist-client-msg-out-v3-1-1-db.py | 3 +-- .../15-persist-client-msg-out-v3-1-1.py | 3 +-- test/broker/15-persist-client-msg-out-v5-0.py | 3 +-- test/broker/15-persist-client-v3-1-1.py | 3 +-- test/broker/15-persist-client-v5-0.py | 3 +-- test/broker/15-persist-client-will.py | 8 +++---- test/broker/15-persist-migrate-db.py | 3 +-- .../15-persist-publish-properties-v5-0.py | 3 +-- test/broker/15-persist-retain-clear.py | 3 +-- test/broker/15-persist-retain-v3-1-1.py | 3 +-- test/broker/15-persist-retain-v5-0.py | 3 +-- test/broker/15-persist-subscription-v3-1-1.py | 3 +-- test/broker/15-persist-subscription-v5-0.py | 3 +-- test/broker/16-config-includedir.py | 3 +-- test/broker/17-control-list-listeners.py | 3 +-- test/broker/17-control-list-plugins.py | 3 +-- test/broker/17-control-missing-endpoint.py | 3 +-- test/broker/20-sparkplug-aware.py | 3 +-- test/broker/20-sparkplug-compliance.py | 3 +-- test/broker/21-proxy-v1-bad.py | 6 ++--- test/broker/21-proxy-v1-success.py | 6 ++--- test/broker/21-proxy-v2-bad-header.py | 3 +-- test/broker/21-proxy-v2-ipv4.py | 6 ++--- test/broker/21-proxy-v2-ipv6.py | 6 ++--- test/broker/21-proxy-v2-local.py | 3 +-- test/broker/21-proxy-v2-long-tlv.py | 6 ++--- test/broker/21-proxy-v2-lost-connection.py | 3 +-- test/broker/21-proxy-v2-ssl-cipher.py | 6 ++--- .../21-proxy-v2-ssl-common-name-failure.py | 6 ++--- .../21-proxy-v2-ssl-common-name-success.py | 6 ++--- .../21-proxy-v2-ssl-require-cert-failure.py | 6 ++--- .../21-proxy-v2-ssl-require-cert-success.py | 6 ++--- .../21-proxy-v2-ssl-require-tls-failure.py | 6 ++--- .../21-proxy-v2-ssl-require-tls-success.py | 6 ++--- test/broker/21-proxy-v2-unix.py | 6 ++--- test/broker/21-proxy-v2-websockets.py | 6 ++--- test/broker/22-http-api-acl.py | 3 +-- test/broker/22-http-api-api.py | 3 +-- test/broker/22-http-api-auth.py | 3 +-- test/broker/22-http-api-file.py | 3 +-- test/broker/22-http-api-tls.py | 3 +-- test/broker/23-security-acl-file-reload.py | 3 +-- .../23-security-password-file-reload.py | 3 +-- test/broker/mosq_test_helper.py | 7 +++--- test/client/02-subscribe-env.py | 3 +-- test/client/02-subscribe-format.py | 3 +-- test/client/03-publish-env.py | 3 +-- test/client/03-publish-file.py | 3 +-- test/client/04-rr-env.py | 3 +-- test/client/04-rr-qos1-ws.py | 3 +-- test/client/04-rr-qos1.py | 3 +-- test/mosq_test.py | 24 +++++++++++-------- 281 files changed, 345 insertions(+), 601 deletions(-) diff --git a/test/apps/ctrl/ctrl-broker.py b/test/apps/ctrl/ctrl-broker.py index c0422ce6..83b018c0 100755 --- a/test/apps/ctrl/ctrl-broker.py +++ b/test/apps/ctrl/ctrl-broker.py @@ -96,9 +96,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/apps/ctrl/ctrl-dynsec.py b/test/apps/ctrl/ctrl-dynsec.py index aa2059cf..7827317a 100755 --- a/test/apps/ctrl/ctrl-dynsec.py +++ b/test/apps/ctrl/ctrl-dynsec.py @@ -84,7 +84,7 @@ ctrl_dynsec_file_cmd(["setClientPassword", "admin", "newadmin", "-i", "10000"], ctrl_dynsec_file_cmd(["setClientPassword", "admin", "newadmin"], ports) # Then start broker -broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=ports[0], nolog=True) +broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=ports[0]) try: rc = 1 @@ -239,5 +239,7 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 + if rc: + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/01-bad-initial-packets.py b/test/broker/01-bad-initial-packets.py index 5385cee5..d34c96cf 100755 --- a/test/broker/01-bad-initial-packets.py +++ b/test/broker/01-bad-initial-packets.py @@ -71,9 +71,8 @@ def do_test(port): os.remove(conf_file) broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/01-connect-575314.py b/test/broker/01-connect-575314.py index 5f4ce32c..b39da16f 100755 --- a/test/broker/01-connect-575314.py +++ b/test/broker/01-connect-575314.py @@ -41,9 +41,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/01-connect-accept-protocol.py b/test/broker/01-connect-accept-protocol.py index 23942ed6..424f60a8 100755 --- a/test/broker/01-connect-accept-protocol.py +++ b/test/broker/01-connect-accept-protocol.py @@ -47,9 +47,8 @@ def do_test(accept, expect_success): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/01-connect-allow-anonymous.py b/test/broker/01-connect-allow-anonymous.py index 693d0b80..5de31621 100755 --- a/test/broker/01-connect-allow-anonymous.py +++ b/test/broker/01-connect-allow-anonymous.py @@ -85,9 +85,8 @@ def do_test(use_conf, write_config, expect_success): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/01-connect-auto-id.py b/test/broker/01-connect-auto-id.py index e917a2b5..2dc62fcb 100755 --- a/test/broker/01-connect-auto-id.py +++ b/test/broker/01-connect-auto-id.py @@ -80,10 +80,9 @@ def do_test(config_func, client_port, auto_id): 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: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/01-connect-disconnect-v5.py b/test/broker/01-connect-disconnect-v5.py index 4fdb6982..06e81720 100755 --- a/test/broker/01-connect-disconnect-v5.py +++ b/test/broker/01-connect-disconnect-v5.py @@ -67,9 +67,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/01-connect-global-max-clients.py b/test/broker/01-connect-global-max-clients.py index 69b1ebd7..8b2508a2 100755 --- a/test/broker/01-connect-global-max-clients.py +++ b/test/broker/01-connect-global-max-clients.py @@ -65,9 +65,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) return rc sys.exit(do_test()) diff --git a/test/broker/01-connect-global-max-connections.py b/test/broker/01-connect-global-max-connections.py index 5f21269d..10673fd5 100755 --- a/test/broker/01-connect-global-max-connections.py +++ b/test/broker/01-connect-global-max-connections.py @@ -79,9 +79,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) return rc sys.exit(do_test()) diff --git a/test/broker/01-connect-listener-allow-anonymous.py b/test/broker/01-connect-listener-allow-anonymous.py index c935e83d..ee938e69 100755 --- a/test/broker/01-connect-listener-allow-anonymous.py +++ b/test/broker/01-connect-listener-allow-anonymous.py @@ -116,9 +116,8 @@ def do_test(write_config, expect_success1, expect_success2): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/01-connect-max-connections.py b/test/broker/01-connect-max-connections.py index f6124899..8326cfdf 100755 --- a/test/broker/01-connect-max-connections.py +++ b/test/broker/01-connect-max-connections.py @@ -70,9 +70,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) return rc sys.exit(do_test()) diff --git a/test/broker/01-connect-max-keepalive.py b/test/broker/01-connect-max-keepalive.py index d9429448..dc84f1f7 100755 --- a/test/broker/01-connect-max-keepalive.py +++ b/test/broker/01-connect-max-keepalive.py @@ -36,9 +36,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(3) diff --git a/test/broker/01-connect-take-over.py b/test/broker/01-connect-take-over.py index 6356181d..dd336f36 100755 --- a/test/broker/01-connect-take-over.py +++ b/test/broker/01-connect-take-over.py @@ -30,7 +30,6 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/01-connect-uname-no-password-denied.py b/test/broker/01-connect-uname-no-password-denied.py index 9da98617..89f00b28 100755 --- a/test/broker/01-connect-uname-no-password-denied.py +++ b/test/broker/01-connect-uname-no-password-denied.py @@ -40,9 +40,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/01-connect-uname-or-anon.py b/test/broker/01-connect-uname-or-anon.py index 65cc54a7..883123c6 100755 --- a/test/broker/01-connect-uname-or-anon.py +++ b/test/broker/01-connect-uname-or-anon.py @@ -54,9 +54,8 @@ def do_test(allow_anonymous, password_file, username, expect_success): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d, allow_anonymous=%d, password_file=%d, username=%d" % (proto_ver, allow_anonymous, password_file, username)) exit(rc) 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 9cdc51c3..72110bb1 100755 --- a/test/broker/01-connect-uname-password-denied-no-will.py +++ b/test/broker/01-connect-uname-password-denied-no-will.py @@ -63,9 +63,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/01-connect-uname-password-denied.py b/test/broker/01-connect-uname-password-denied.py index 8372e8bb..fa8734e4 100755 --- a/test/broker/01-connect-uname-password-denied.py +++ b/test/broker/01-connect-uname-password-denied.py @@ -42,9 +42,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) 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 2d53fa75..77108b8f 100755 --- a/test/broker/01-connect-uname-password-success-no-tls.py +++ b/test/broker/01-connect-uname-password-success-no-tls.py @@ -38,9 +38,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/01-connect-unix-socket.py b/test/broker/01-connect-unix-socket.py index 4ff5966d..22f88cf5 100755 --- a/test/broker/01-connect-unix-socket.py +++ b/test/broker/01-connect-unix-socket.py @@ -45,9 +45,8 @@ def do_test(): os.remove(f"{port}.sock") except FileNotFoundError: pass - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test() diff --git a/test/broker/01-connect-windows-line-endings.py b/test/broker/01-connect-windows-line-endings.py index b0658ae3..693a890a 100755 --- a/test/broker/01-connect-windows-line-endings.py +++ b/test/broker/01-connect-windows-line-endings.py @@ -39,9 +39,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/01-connect-zero-length-id.py b/test/broker/01-connect-zero-length-id.py index e29e54a0..6d1f8905 100755 --- a/test/broker/01-connect-zero-length-id.py +++ b/test/broker/01-connect-zero-length-id.py @@ -55,10 +55,9 @@ def do_test(per_listener, proto_ver, clean_start, allow_zero, client_port, expec 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: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) print("per_listener:%s proto_ver:%d client_port:%d clean_start:%d allow_zero:%s" % (per_listener, proto_ver, client_port, clean_start, allow_zero)) print("port1:%d port2:%d" % (port1, port2)) exit(rc) diff --git a/test/broker/01-plugin-connect-uname-password-denied.py b/test/broker/01-plugin-connect-uname-password-denied.py index 003adb7b..b51cf772 100755 --- a/test/broker/01-plugin-connect-uname-password-denied.py +++ b/test/broker/01-plugin-connect-uname-password-denied.py @@ -43,9 +43,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-shared-nolocal.py b/test/broker/02-shared-nolocal.py index efaca05d..e52a391a 100755 --- a/test/broker/02-shared-nolocal.py +++ b/test/broker/02-shared-nolocal.py @@ -33,9 +33,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) else: return rc diff --git a/test/broker/02-shared-qos0-v5.py b/test/broker/02-shared-qos0-v5.py index 0377fae2..43f08c96 100755 --- a/test/broker/02-shared-qos0-v5.py +++ b/test/broker/02-shared-qos0-v5.py @@ -130,9 +130,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subhier-crash.py b/test/broker/02-subhier-crash.py index e4cd6232..8f720511 100755 --- a/test/broker/02-subhier-crash.py +++ b/test/broker/02-subhier-crash.py @@ -52,9 +52,8 @@ def do_test(start_broker=True): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-b2c-topic-alias.py b/test/broker/02-subpub-b2c-topic-alias.py index 22c9b3b6..ec92fa6c 100755 --- a/test/broker/02-subpub-b2c-topic-alias.py +++ b/test/broker/02-subpub-b2c-topic-alias.py @@ -83,9 +83,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos0-long-topic.py b/test/broker/02-subpub-qos0-long-topic.py index 137013fb..f7608215 100755 --- a/test/broker/02-subpub-qos0-long-topic.py +++ b/test/broker/02-subpub-qos0-long-topic.py @@ -42,9 +42,8 @@ def do_test(start_broker, topic, succeeds): 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')) + print(mosq_test.broker_log(broker)) return rc diff --git a/test/broker/02-subpub-qos0-oversize-payload.py b/test/broker/02-subpub-qos0-oversize-payload.py index 9a40054e..e312052d 100755 --- a/test/broker/02-subpub-qos0-oversize-payload.py +++ b/test/broker/02-subpub-qos0-oversize-payload.py @@ -64,9 +64,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos0-queued-bytes.py b/test/broker/02-subpub-qos0-queued-bytes.py index 3d95d246..10ae8218 100755 --- a/test/broker/02-subpub-qos0-queued-bytes.py +++ b/test/broker/02-subpub-qos0-queued-bytes.py @@ -50,9 +50,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos0-retain-as-publish.py b/test/broker/02-subpub-qos0-retain-as-publish.py index 1a1c74b5..48b933fb 100755 --- a/test/broker/02-subpub-qos0-retain-as-publish.py +++ b/test/broker/02-subpub-qos0-retain-as-publish.py @@ -51,9 +51,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos0-send-retain.py b/test/broker/02-subpub-qos0-send-retain.py index 38bd0aa6..0dead538 100755 --- a/test/broker/02-subpub-qos0-send-retain.py +++ b/test/broker/02-subpub-qos0-send-retain.py @@ -74,9 +74,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos0-subscription-id.py b/test/broker/02-subpub-qos0-subscription-id.py index b7604b9e..4912fc43 100755 --- a/test/broker/02-subpub-qos0-subscription-id.py +++ b/test/broker/02-subpub-qos0-subscription-id.py @@ -101,9 +101,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos0-topic-alias-unknown.py b/test/broker/02-subpub-qos0-topic-alias-unknown.py index a752cdd6..9fe1eecb 100755 --- a/test/broker/02-subpub-qos0-topic-alias-unknown.py +++ b/test/broker/02-subpub-qos0-topic-alias-unknown.py @@ -35,9 +35,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos0-topic-alias.py b/test/broker/02-subpub-qos0-topic-alias.py index a4ce23d8..6bffb147 100755 --- a/test/broker/02-subpub-qos0-topic-alias.py +++ b/test/broker/02-subpub-qos0-topic-alias.py @@ -52,9 +52,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos1-message-expiry-retain.py b/test/broker/02-subpub-qos1-message-expiry-retain.py index b83bb8d2..bd0e79ec 100755 --- a/test/broker/02-subpub-qos1-message-expiry-retain.py +++ b/test/broker/02-subpub-qos1-message-expiry-retain.py @@ -82,9 +82,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos1-message-expiry-will.py b/test/broker/02-subpub-qos1-message-expiry-will.py index f599f558..6c139bbc 100755 --- a/test/broker/02-subpub-qos1-message-expiry-will.py +++ b/test/broker/02-subpub-qos1-message-expiry-will.py @@ -63,9 +63,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos1-message-expiry.py b/test/broker/02-subpub-qos1-message-expiry.py index 789c1379..f87fceb8 100755 --- a/test/broker/02-subpub-qos1-message-expiry.py +++ b/test/broker/02-subpub-qos1-message-expiry.py @@ -70,9 +70,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos1-nolocal.py b/test/broker/02-subpub-qos1-nolocal.py index a0b7f6db..4bc747e6 100755 --- a/test/broker/02-subpub-qos1-nolocal.py +++ b/test/broker/02-subpub-qos1-nolocal.py @@ -56,9 +56,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos1-oversize-payload.py b/test/broker/02-subpub-qos1-oversize-payload.py index 11504e83..538c349e 100755 --- a/test/broker/02-subpub-qos1-oversize-payload.py +++ b/test/broker/02-subpub-qos1-oversize-payload.py @@ -70,9 +70,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos1.py b/test/broker/02-subpub-qos1.py index d80685f6..2daf4eee 100755 --- a/test/broker/02-subpub-qos1.py +++ b/test/broker/02-subpub-qos1.py @@ -43,9 +43,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/02-subpub-qos2-1322.py b/test/broker/02-subpub-qos2-1322.py index 56d1bf8e..a69d098c 100755 --- a/test/broker/02-subpub-qos2-1322.py +++ b/test/broker/02-subpub-qos2-1322.py @@ -140,9 +140,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/02-subpub-qos2-max-inflight-bytes.py b/test/broker/02-subpub-qos2-max-inflight-bytes.py index 71c99e6e..e0f4167b 100755 --- a/test/broker/02-subpub-qos2-max-inflight-bytes.py +++ b/test/broker/02-subpub-qos2-max-inflight-bytes.py @@ -192,9 +192,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos2-pubrec-error.py b/test/broker/02-subpub-qos2-pubrec-error.py index 7ae4858e..301c0069 100755 --- a/test/broker/02-subpub-qos2-pubrec-error.py +++ b/test/broker/02-subpub-qos2-pubrec-error.py @@ -76,9 +76,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/02-subpub-qos2-receive-maximum-1.py b/test/broker/02-subpub-qos2-receive-maximum-1.py index b9d3a2c3..96228c39 100755 --- a/test/broker/02-subpub-qos2-receive-maximum-1.py +++ b/test/broker/02-subpub-qos2-receive-maximum-1.py @@ -105,9 +105,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subpub-qos2-receive-maximum-2.py b/test/broker/02-subpub-qos2-receive-maximum-2.py index 383c3f4a..c39aeb2d 100755 --- a/test/broker/02-subpub-qos2-receive-maximum-2.py +++ b/test/broker/02-subpub-qos2-receive-maximum-2.py @@ -108,9 +108,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/02-subpub-qos2.py b/test/broker/02-subpub-qos2.py index cb319ac6..fe0f3448 100755 --- a/test/broker/02-subpub-qos2.py +++ b/test/broker/02-subpub-qos2.py @@ -53,9 +53,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/02-subpub-recover-subscriptions.py b/test/broker/02-subpub-recover-subscriptions.py index abc96431..eb995232 100755 --- a/test/broker/02-subpub-recover-subscriptions.py +++ b/test/broker/02-subpub-recover-subscriptions.py @@ -72,9 +72,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/02-subscribe-dollar-v5.py b/test/broker/02-subscribe-dollar-v5.py index befdcdff..d18fee12 100755 --- a/test/broker/02-subscribe-dollar-v5.py +++ b/test/broker/02-subscribe-dollar-v5.py @@ -37,9 +37,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/02-subscribe-invalid-utf8.py b/test/broker/02-subscribe-invalid-utf8.py index 60e1f724..2b6fa71d 100755 --- a/test/broker/02-subscribe-invalid-utf8.py +++ b/test/broker/02-subscribe-invalid-utf8.py @@ -39,9 +39,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/02-subscribe-long-topic.py b/test/broker/02-subscribe-long-topic.py index d0882241..def1d6b7 100755 --- a/test/broker/02-subscribe-long-topic.py +++ b/test/broker/02-subscribe-long-topic.py @@ -38,9 +38,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/02-subscribe-persistence-flipflop.py b/test/broker/02-subscribe-persistence-flipflop.py index 1a37ac21..a0698ef7 100755 --- a/test/broker/02-subscribe-persistence-flipflop.py +++ b/test/broker/02-subscribe-persistence-flipflop.py @@ -84,9 +84,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/03-pattern-matching.py b/test/broker/03-pattern-matching.py index 882c92e8..aaa40000 100755 --- a/test/broker/03-pattern-matching.py +++ b/test/broker/03-pattern-matching.py @@ -52,10 +52,8 @@ def pattern_test(sub_topic, pub_topic): 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')) - print(stdo.decode('utf-8')) + print(mosq_test.broker_log(broker)) sys.exit(rc) return rc diff --git a/test/broker/03-publish-b2c-disconnect-qos1.py b/test/broker/03-publish-b2c-disconnect-qos1.py index c67be2a4..53993ffd 100755 --- a/test/broker/03-publish-b2c-disconnect-qos1.py +++ b/test/broker/03-publish-b2c-disconnect-qos1.py @@ -73,9 +73,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/03-publish-b2c-disconnect-qos2.py b/test/broker/03-publish-b2c-disconnect-qos2.py index 03205526..7655237b 100755 --- a/test/broker/03-publish-b2c-disconnect-qos2.py +++ b/test/broker/03-publish-b2c-disconnect-qos2.py @@ -86,9 +86,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/03-publish-b2c-qos1-len.py b/test/broker/03-publish-b2c-qos1-len.py index 2fb117d4..05b185df 100755 --- a/test/broker/03-publish-b2c-qos1-len.py +++ b/test/broker/03-publish-b2c-qos1-len.py @@ -55,9 +55,8 @@ def do_test(start_broker, test, puback_packet): 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')) + print(mosq_test.broker_log(broker)) print(test) exit(rc) else: diff --git a/test/broker/03-publish-b2c-qos2-len.py b/test/broker/03-publish-b2c-qos2-len.py index bb59165b..9c23efa6 100755 --- a/test/broker/03-publish-b2c-qos2-len.py +++ b/test/broker/03-publish-b2c-qos2-len.py @@ -63,9 +63,8 @@ def do_test(start_broker, test, pubrec_packet, pubcomp_packet): 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')) + print(mosq_test.broker_log(broker)) print(test) exit(rc) else: diff --git a/test/broker/03-publish-bad-flags.py b/test/broker/03-publish-bad-flags.py index e70125c4..14b206bc 100755 --- a/test/broker/03-publish-bad-flags.py +++ b/test/broker/03-publish-bad-flags.py @@ -57,8 +57,7 @@ finally: 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: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/03-publish-c2b-disconnect-qos2.py b/test/broker/03-publish-c2b-disconnect-qos2.py index 4d40c4b2..49684bf0 100755 --- a/test/broker/03-publish-c2b-disconnect-qos2.py +++ b/test/broker/03-publish-c2b-disconnect-qos2.py @@ -75,9 +75,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/03-publish-c2b-qos2-len.py b/test/broker/03-publish-c2b-qos2-len.py index 87d018ad..006af3cc 100755 --- a/test/broker/03-publish-c2b-qos2-len.py +++ b/test/broker/03-publish-c2b-qos2-len.py @@ -38,9 +38,8 @@ def do_test(start_broker, test, pubrel_packet): 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')) + print(mosq_test.broker_log(broker)) print(test) exit(rc) else: diff --git a/test/broker/03-publish-dollar-v5.py b/test/broker/03-publish-dollar-v5.py index d80d3cf9..a75e63b9 100755 --- a/test/broker/03-publish-dollar-v5.py +++ b/test/broker/03-publish-dollar-v5.py @@ -44,9 +44,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/03-publish-dollar.py b/test/broker/03-publish-dollar.py index b560c967..f0aec185 100755 --- a/test/broker/03-publish-dollar.py +++ b/test/broker/03-publish-dollar.py @@ -32,9 +32,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/03-publish-invalid-utf8.py b/test/broker/03-publish-invalid-utf8.py index c5acd075..4d07bbdd 100755 --- a/test/broker/03-publish-invalid-utf8.py +++ b/test/broker/03-publish-invalid-utf8.py @@ -39,9 +39,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/03-publish-long-topic.py b/test/broker/03-publish-long-topic.py index b812624c..07e01464 100755 --- a/test/broker/03-publish-long-topic.py +++ b/test/broker/03-publish-long-topic.py @@ -39,9 +39,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/03-publish-qos1-max-inflight-expire.py b/test/broker/03-publish-qos1-max-inflight-expire.py index 34225066..daf62e92 100755 --- a/test/broker/03-publish-qos1-max-inflight-expire.py +++ b/test/broker/03-publish-qos1-max-inflight-expire.py @@ -85,9 +85,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/03-publish-qos1-max-inflight.py b/test/broker/03-publish-qos1-max-inflight.py index 3da6e335..f576b679 100755 --- a/test/broker/03-publish-qos1-max-inflight.py +++ b/test/broker/03-publish-qos1-max-inflight.py @@ -43,9 +43,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/03-publish-qos1-no-subscribers-v5.py b/test/broker/03-publish-qos1-no-subscribers-v5.py index 687e59a8..1ac6d875 100755 --- a/test/broker/03-publish-qos1-no-subscribers-v5.py +++ b/test/broker/03-publish-qos1-no-subscribers-v5.py @@ -69,9 +69,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/03-publish-qos1-queued-bytes.py b/test/broker/03-publish-qos1-queued-bytes.py index 7e935fb9..19bd63dc 100755 --- a/test/broker/03-publish-qos1-queued-bytes.py +++ b/test/broker/03-publish-qos1-queued-bytes.py @@ -155,9 +155,8 @@ finally: rq.join() cq.join() broker.terminate() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/03-publish-qos1-retain-disabled.py b/test/broker/03-publish-qos1-retain-disabled.py index f4710aef..d464e1d6 100755 --- a/test/broker/03-publish-qos1-retain-disabled.py +++ b/test/broker/03-publish-qos1-retain-disabled.py @@ -46,9 +46,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/03-publish-qos1.py b/test/broker/03-publish-qos1.py index 3b8dce6e..392c9ad9 100755 --- a/test/broker/03-publish-qos1.py +++ b/test/broker/03-publish-qos1.py @@ -36,9 +36,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/03-publish-qos2-dup.py b/test/broker/03-publish-qos2-dup.py index 70834fab..81e0d356 100755 --- a/test/broker/03-publish-qos2-dup.py +++ b/test/broker/03-publish-qos2-dup.py @@ -38,9 +38,8 @@ def do_test(proto_ver): finally: broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/03-publish-qos2-max-inflight-exceeded.py b/test/broker/03-publish-qos2-max-inflight-exceeded.py index 2ab146ea..1994893f 100755 --- a/test/broker/03-publish-qos2-max-inflight-exceeded.py +++ b/test/broker/03-publish-qos2-max-inflight-exceeded.py @@ -40,9 +40,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/03-publish-qos2-max-inflight.py b/test/broker/03-publish-qos2-max-inflight.py index 6a31d97f..6783a22d 100755 --- a/test/broker/03-publish-qos2-max-inflight.py +++ b/test/broker/03-publish-qos2-max-inflight.py @@ -48,9 +48,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/03-publish-qos2-reuse-mid.py b/test/broker/03-publish-qos2-reuse-mid.py index e9454d01..9ad64d18 100755 --- a/test/broker/03-publish-qos2-reuse-mid.py +++ b/test/broker/03-publish-qos2-reuse-mid.py @@ -50,9 +50,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/03-publish-qos2.py b/test/broker/03-publish-qos2.py index b07c5d51..a6211992 100755 --- a/test/broker/03-publish-qos2.py +++ b/test/broker/03-publish-qos2.py @@ -35,9 +35,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: 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 3801988b..958bc512 100755 --- a/test/broker/04-retain-check-source-persist-diff-port.py +++ b/test/broker/04-retain-check-source-persist-diff-port.py @@ -110,9 +110,8 @@ def do_test(proto_ver, per_listener, username): os.remove(persistence_file) except FileNotFoundError: pass - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/04-retain-check-source-persist.py b/test/broker/04-retain-check-source-persist.py index 2ac36f3c..fac748c9 100755 --- a/test/broker/04-retain-check-source-persist.py +++ b/test/broker/04-retain-check-source-persist.py @@ -92,9 +92,8 @@ def do_test(proto_ver, per_listener, username): os.remove(conf_file) os.remove(acl_file) os.remove(persistence_file) - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/04-retain-check-source.py b/test/broker/04-retain-check-source.py index b409729b..cb03eca1 100755 --- a/test/broker/04-retain-check-source.py +++ b/test/broker/04-retain-check-source.py @@ -72,9 +72,8 @@ def do_test(proto_ver, per_listener): 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')) + print(mosq_test.broker_log(broker)) exit(rc) port = mosq_test.get_port() diff --git a/test/broker/04-retain-clear-multiple.py b/test/broker/04-retain-clear-multiple.py index be185a21..5c53d4c9 100755 --- a/test/broker/04-retain-clear-multiple.py +++ b/test/broker/04-retain-clear-multiple.py @@ -70,9 +70,8 @@ def do_test(): finally: broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test() diff --git a/test/broker/04-retain-qos0-clear.py b/test/broker/04-retain-qos0-clear.py index ce69aaa0..5be41343 100755 --- a/test/broker/04-retain-qos0-clear.py +++ b/test/broker/04-retain-qos0-clear.py @@ -59,9 +59,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/04-retain-qos0-fresh.py b/test/broker/04-retain-qos0-fresh.py index d0ec44a9..b0b1b9f5 100755 --- a/test/broker/04-retain-qos0-fresh.py +++ b/test/broker/04-retain-qos0-fresh.py @@ -38,9 +38,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/04-retain-qos0-repeated.py b/test/broker/04-retain-qos0-repeated.py index 20cc23ff..a5ffba5e 100755 --- a/test/broker/04-retain-qos0-repeated.py +++ b/test/broker/04-retain-qos0-repeated.py @@ -45,9 +45,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/04-retain-qos0.py b/test/broker/04-retain-qos0.py index 930da869..fa0c5ca2 100755 --- a/test/broker/04-retain-qos0.py +++ b/test/broker/04-retain-qos0.py @@ -36,9 +36,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/04-retain-qos1-qos0.py b/test/broker/04-retain-qos1-qos0.py index a5bba759..51967673 100755 --- a/test/broker/04-retain-qos1-qos0.py +++ b/test/broker/04-retain-qos1-qos0.py @@ -44,9 +44,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/04-retain-upgrade-outgoing-qos.py b/test/broker/04-retain-upgrade-outgoing-qos.py index e0b1ef6e..6f6dd1af 100755 --- a/test/broker/04-retain-upgrade-outgoing-qos.py +++ b/test/broker/04-retain-upgrade-outgoing-qos.py @@ -48,9 +48,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/05-clean-session-qos1.py b/test/broker/05-clean-session-qos1.py index 06bcfcb9..e75d60c3 100755 --- a/test/broker/05-clean-session-qos1.py +++ b/test/broker/05-clean-session-qos1.py @@ -68,9 +68,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/05-session-expiry-kick.py b/test/broker/05-session-expiry-kick.py index 17d8fd8e..5836fcea 100755 --- a/test/broker/05-session-expiry-kick.py +++ b/test/broker/05-session-expiry-kick.py @@ -46,9 +46,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/05-session-expiry-v5.py b/test/broker/05-session-expiry-v5.py index f6b0e575..6873ce62 100755 --- a/test/broker/05-session-expiry-v5.py +++ b/test/broker/05-session-expiry-v5.py @@ -98,9 +98,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/06-bridge-b2br-disconnect-qos1.py b/test/broker/06-bridge-b2br-disconnect-qos1.py index a4d96f95..c9b9be13 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos1.py +++ b/test/broker/06-bridge-b2br-disconnect-qos1.py @@ -110,10 +110,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(proto_ver=4) diff --git a/test/broker/06-bridge-b2br-disconnect-qos2.py b/test/broker/06-bridge-b2br-disconnect-qos2.py index f8df8fc6..3a51716c 100755 --- a/test/broker/06-bridge-b2br-disconnect-qos2.py +++ b/test/broker/06-bridge-b2br-disconnect-qos2.py @@ -125,10 +125,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-b2br-late-connection-retain.py b/test/broker/06-bridge-b2br-late-connection-retain.py index 2b620673..c106aba9 100755 --- a/test/broker/06-bridge-b2br-late-connection-retain.py +++ b/test/broker/06-bridge-b2br-late-connection-retain.py @@ -108,11 +108,10 @@ def do_test(proto_ver): 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() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-b2br-late-connection.py b/test/broker/06-bridge-b2br-late-connection.py index 3a213446..c3ff7fcf 100755 --- a/test/broker/06-bridge-b2br-late-connection.py +++ b/test/broker/06-bridge-b2br-late-connection.py @@ -80,10 +80,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(proto_ver=4) diff --git a/test/broker/06-bridge-b2br-remapping.py b/test/broker/06-bridge-b2br-remapping.py index 0913cb67..3ee038fe 100755 --- a/test/broker/06-bridge-b2br-remapping.py +++ b/test/broker/06-bridge-b2br-remapping.py @@ -155,10 +155,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-br2b-disconnect-qos1.py b/test/broker/06-bridge-br2b-disconnect-qos1.py index 6af7e6c1..bb0fd141 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos1.py +++ b/test/broker/06-bridge-br2b-disconnect-qos1.py @@ -113,10 +113,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-br2b-disconnect-qos2.py b/test/broker/06-bridge-br2b-disconnect-qos2.py index 8dde1d1c..8bf13019 100755 --- a/test/broker/06-bridge-br2b-disconnect-qos2.py +++ b/test/broker/06-bridge-br2b-disconnect-qos2.py @@ -141,10 +141,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-br2b-remapping.py b/test/broker/06-bridge-br2b-remapping.py index 97513907..4dffded3 100755 --- a/test/broker/06-bridge-br2b-remapping.py +++ b/test/broker/06-bridge-br2b-remapping.py @@ -127,10 +127,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-clean-session-core.py b/test/broker/06-bridge-clean-session-core.py index 46a2719e..6dfc25d9 100755 --- a/test/broker/06-bridge-clean-session-core.py +++ b/test/broker/06-bridge-clean-session-core.py @@ -179,7 +179,7 @@ def do_test(proto_ver, cs, lcs=None): if mosq_test.wait_for_subprocess(broker_b): print("broker_b not terminated") broker_termination_success = False - (stdo_b1, stde_b1) = broker_b.communicate() + stde_b1 = broker_log(broker_b) # as we're _terminating_ the connections should close ~straight away tprint("terminated B", time.time()) @@ -215,7 +215,7 @@ def do_test(proto_ver, cs, lcs=None): if mosq_test.wait_for_subprocess(broker_a): print("broker_a not terminated") broker_termination_success = False - (stdo_a1, stde_a1) = broker_a.communicate() + stde_a1 = mosq_test.broker_log(broker_a) time.sleep(0.5) mosq_test.do_send_receive(client_b, pub_b2.p, pub_b2.ack, "puback_b2") @@ -254,8 +254,8 @@ def do_test(proto_ver, cs, lcs=None): 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() + stde_a = broker_log(broker_a) + stde_b = broker_log(broker_b) # Must be after terminating! try: os.remove(persistence_file_a) @@ -268,12 +268,12 @@ def do_test(proto_ver, cs, lcs=None): if not success: print("Test failed, dumping broker A logs: ") if stde_a1: - print(stde_a1.decode('utf-8')) - print(stde_a.decode('utf-8')) + print(stde_a1)) + print(stde_a) print("Test failed, dumping broker B logs: ") if stde_b1: - print(stde_b1.decode('utf-8')) - print(stde_b.decode('utf-8')) + print(stde_b1) + print(stde_b) exit(1) if sys.argv[3] == "True": diff --git a/test/broker/06-bridge-config-reload.py b/test/broker/06-bridge-config-reload.py index 21b253a8..fa161adb 100755 --- a/test/broker/06-bridge-config-reload.py +++ b/test/broker/06-bridge-config-reload.py @@ -105,9 +105,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) except NameError: pass diff --git a/test/broker/06-bridge-fail-persist-resend-qos1.py b/test/broker/06-bridge-fail-persist-resend-qos1.py index ba084252..32a179e2 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos1.py +++ b/test/broker/06-bridge-fail-persist-resend-qos1.py @@ -94,10 +94,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() sock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(proto_ver=4) diff --git a/test/broker/06-bridge-fail-persist-resend-qos2.py b/test/broker/06-bridge-fail-persist-resend-qos2.py index cfa334ea..ed5cb5b3 100755 --- a/test/broker/06-bridge-fail-persist-resend-qos2.py +++ b/test/broker/06-bridge-fail-persist-resend-qos2.py @@ -106,10 +106,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() sock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-no-local.py b/test/broker/06-bridge-no-local.py index 16a31515..2ec730ae 100755 --- a/test/broker/06-bridge-no-local.py +++ b/test/broker/06-bridge-no-local.py @@ -40,9 +40,8 @@ def do_test(start_broker, proto_ver_connect, proto_ver_msgs, sub_opts): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/06-bridge-outgoing-retain.py b/test/broker/06-bridge-outgoing-retain.py index f6970364..82a3c6f3 100755 --- a/test/broker/06-bridge-outgoing-retain.py +++ b/test/broker/06-bridge-outgoing-retain.py @@ -100,10 +100,9 @@ def do_test(proto_ver, outgoing_retain): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(proto_ver=4, outgoing_retain="true") diff --git a/test/broker/06-bridge-per-listener-settings.py b/test/broker/06-bridge-per-listener-settings.py index 8fa84fb3..1465007f 100755 --- a/test/broker/06-bridge-per-listener-settings.py +++ b/test/broker/06-bridge-per-listener-settings.py @@ -146,10 +146,9 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-reconnect-local-out.py b/test/broker/06-bridge-reconnect-local-out.py index 4f086896..0672ca54 100755 --- a/test/broker/06-bridge-reconnect-local-out.py +++ b/test/broker/06-bridge-reconnect-local-out.py @@ -103,9 +103,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) local_broker.terminate() if mosq_test.wait_for_subprocess(local_broker): print("local_broker not terminated") @@ -116,8 +115,7 @@ def do_test(proto_ver): pass if rc: - (stdo, stde) = local_broker.communicate() - print(stde.decode('utf-8')) + print(mosq_test.broker_log(local_broker)) if pub: (stdo, stde) = pub.communicate() print(stdo.decode('utf-8')) diff --git a/test/broker/06-bridge-remap-receive-wildcard.py b/test/broker/06-bridge-remap-receive-wildcard.py index de5e7401..7a9144f9 100755 --- a/test/broker/06-bridge-remap-receive-wildcard.py +++ b/test/broker/06-bridge-remap-receive-wildcard.py @@ -100,10 +100,9 @@ def do_test(proto_ver): broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/06-bridge-remote-shutdown.py b/test/broker/06-bridge-remote-shutdown.py index b75bd12c..d5e38416 100755 --- a/test/broker/06-bridge-remote-shutdown.py +++ b/test/broker/06-bridge-remote-shutdown.py @@ -74,10 +74,10 @@ def do_test(proto_ver): rc2, stde2 = mosq_test.terminate_broker(local_broker) if rc or rc1 or rc2: print(f"Remote broker first run rc={rc1}") - print(stde1.decode('utf-8')) + print(stde1) print(f"Local broker rc={rc2}") - print(stde2.decode('utf-8')) + print(stde2) try: os.remove(conf_file) except OSError: diff --git a/test/broker/07-will-control.py b/test/broker/07-will-control.py index 68d2eccb..494ff125 100755 --- a/test/broker/07-will-control.py +++ b/test/broker/07-will-control.py @@ -30,9 +30,8 @@ def do_test(start_broker, proto_ver): if start_broker: broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-delay-invalid-573191.py b/test/broker/07-will-delay-invalid-573191.py index f79b195d..2efe80a5 100755 --- a/test/broker/07-will-delay-invalid-573191.py +++ b/test/broker/07-will-delay-invalid-573191.py @@ -25,9 +25,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) return rc sys.exit(do_test()) diff --git a/test/broker/07-will-delay-reconnect.py b/test/broker/07-will-delay-reconnect.py index 504c074e..2fd61220 100755 --- a/test/broker/07-will-delay-reconnect.py +++ b/test/broker/07-will-delay-reconnect.py @@ -58,9 +58,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-delay-recover.py b/test/broker/07-will-delay-recover.py index 7e5c196d..dcdeff1a 100755 --- a/test/broker/07-will-delay-recover.py +++ b/test/broker/07-will-delay-recover.py @@ -67,9 +67,8 @@ def do_test(start_broker, clean_session): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-delay-session-expiry-0.py b/test/broker/07-will-delay-session-expiry-0.py index eded4be9..3b50694b 100755 --- a/test/broker/07-will-delay-session-expiry-0.py +++ b/test/broker/07-will-delay-session-expiry-0.py @@ -50,9 +50,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-delay-session-expiry.py b/test/broker/07-will-delay-session-expiry.py index a32f3999..c6611961 100755 --- a/test/broker/07-will-delay-session-expiry.py +++ b/test/broker/07-will-delay-session-expiry.py @@ -51,9 +51,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-delay-session-expiry2.py b/test/broker/07-will-delay-session-expiry2.py index b82c6474..a949c2e8 100755 --- a/test/broker/07-will-delay-session-expiry2.py +++ b/test/broker/07-will-delay-session-expiry2.py @@ -51,9 +51,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-delay.py b/test/broker/07-will-delay.py index e148ea1e..e8b8b20b 100755 --- a/test/broker/07-will-delay.py +++ b/test/broker/07-will-delay.py @@ -48,9 +48,8 @@ def do_test(start_broker, clean_session): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-disconnect-with-will.py b/test/broker/07-will-disconnect-with-will.py index a4c98dfe..dfbe2b03 100755 --- a/test/broker/07-will-disconnect-with-will.py +++ b/test/broker/07-will-disconnect-with-will.py @@ -45,9 +45,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-invalid-utf8.py b/test/broker/07-will-invalid-utf8.py index 299ac16a..d4577c4d 100755 --- a/test/broker/07-will-invalid-utf8.py +++ b/test/broker/07-will-invalid-utf8.py @@ -28,9 +28,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/07-will-no-flag.py b/test/broker/07-will-no-flag.py index f4965455..1f2f48af 100755 --- a/test/broker/07-will-no-flag.py +++ b/test/broker/07-will-no-flag.py @@ -32,9 +32,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/07-will-null-topic.py b/test/broker/07-will-null-topic.py index f1aaa4d1..7c03dd9c 100755 --- a/test/broker/07-will-null-topic.py +++ b/test/broker/07-will-null-topic.py @@ -29,9 +29,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) return rc diff --git a/test/broker/07-will-null.py b/test/broker/07-will-null.py index 820efb30..d8fad450 100755 --- a/test/broker/07-will-null.py +++ b/test/broker/07-will-null.py @@ -43,9 +43,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) else: diff --git a/test/broker/07-will-oversize-payload.py b/test/broker/07-will-oversize-payload.py index c86619f6..3750b006 100755 --- a/test/broker/07-will-oversize-payload.py +++ b/test/broker/07-will-oversize-payload.py @@ -60,9 +60,8 @@ def do_test(proto_ver, clean_session): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4, True) diff --git a/test/broker/07-will-per-listener.py b/test/broker/07-will-per-listener.py index 29c14c64..1f04c2aa 100755 --- a/test/broker/07-will-per-listener.py +++ b/test/broker/07-will-per-listener.py @@ -48,9 +48,8 @@ def do_test(proto_ver, clean_session): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4, True) diff --git a/test/broker/07-will-properties.py b/test/broker/07-will-properties.py index 5a01647c..de897aed 100755 --- a/test/broker/07-will-properties.py +++ b/test/broker/07-will-properties.py @@ -46,9 +46,8 @@ def do_test(start_broker, will_props, recvd_props): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-qos0.py b/test/broker/07-will-qos0.py index f23dee48..c1cab08b 100755 --- a/test/broker/07-will-qos0.py +++ b/test/broker/07-will-qos0.py @@ -47,9 +47,8 @@ def do_test(start_broker, proto_ver, clean_session): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-reconnect-1273.py b/test/broker/07-will-reconnect-1273.py index 398a7966..242732c6 100755 --- a/test/broker/07-will-reconnect-1273.py +++ b/test/broker/07-will-reconnect-1273.py @@ -70,9 +70,8 @@ def do_test(start_broker, proto_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/07-will-takeover.py b/test/broker/07-will-takeover.py index a5648210..a4ba5de6 100755 --- a/test/broker/07-will-takeover.py +++ b/test/broker/07-will-takeover.py @@ -89,9 +89,8 @@ def do_test(start_broker, proto_ver, clean_session1, clean_session2): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d clean_session1=%d clean_session2=%d" % (proto_ver, clean_session1, clean_session2)) exit(rc) else: diff --git a/test/broker/08-ssl-bridge.py b/test/broker/08-ssl-bridge.py index 7ca944c4..77235d66 100755 --- a/test/broker/08-ssl-bridge.py +++ b/test/broker/08-ssl-bridge.py @@ -88,10 +88,9 @@ def do_test(address): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() ssock.close() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("127.0.0.1") diff --git a/test/broker/08-ssl-connect-cert-auth-crl.py b/test/broker/08-ssl-connect-cert-auth-crl.py index 3cc0ef1b..ff0c34b9 100755 --- a/test/broker/08-ssl-connect-cert-auth-crl.py +++ b/test/broker/08-ssl-connect-cert-auth-crl.py @@ -52,9 +52,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-cert-auth-expired-allowed.py b/test/broker/08-ssl-connect-cert-auth-expired-allowed.py index 184e2082..044338e4 100755 --- a/test/broker/08-ssl-connect-cert-auth-expired-allowed.py +++ b/test/broker/08-ssl-connect-cert-auth-expired-allowed.py @@ -51,9 +51,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-cert-auth-expired.py b/test/broker/08-ssl-connect-cert-auth-expired.py index 73eb2fbf..5a6eace9 100755 --- a/test/broker/08-ssl-connect-cert-auth-expired.py +++ b/test/broker/08-ssl-connect-cert-auth-expired.py @@ -61,12 +61,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if ssl_eof: if "certificate verify failed" in stde.decode('utf-8'): rc = 0 if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-cert-auth-revoked.py b/test/broker/08-ssl-connect-cert-auth-revoked.py index 5e4116db..a28d769d 100755 --- a/test/broker/08-ssl-connect-cert-auth-revoked.py +++ b/test/broker/08-ssl-connect-cert-auth-revoked.py @@ -72,12 +72,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if ssl_eof: if "certificate verify failed" in stde.decode('utf-8'): rc = 0 if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-cert-auth-without.py b/test/broker/08-ssl-connect-cert-auth-without.py index bf351207..6345b3b0 100755 --- a/test/broker/08-ssl-connect-cert-auth-without.py +++ b/test/broker/08-ssl-connect-cert-auth-without.py @@ -56,8 +56,7 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-cert-auth.py b/test/broker/08-ssl-connect-cert-auth.py index 5adb6038..437af87b 100755 --- a/test/broker/08-ssl-connect-cert-auth.py +++ b/test/broker/08-ssl-connect-cert-auth.py @@ -53,9 +53,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-dhparam.py b/test/broker/08-ssl-connect-dhparam.py index 17401a33..cb3b0dd0 100755 --- a/test/broker/08-ssl-connect-dhparam.py +++ b/test/broker/08-ssl-connect-dhparam.py @@ -53,9 +53,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-identity.py b/test/broker/08-ssl-connect-identity.py index aec8c40c..206a46b1 100755 --- a/test/broker/08-ssl-connect-identity.py +++ b/test/broker/08-ssl-connect-identity.py @@ -55,9 +55,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) 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 78f4b1de..c85e74c4 100755 --- a/test/broker/08-ssl-connect-no-auth-wrong-ca.py +++ b/test/broker/08-ssl-connect-no-auth-wrong-ca.py @@ -50,8 +50,7 @@ broker.terminate() 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-no-auth.py b/test/broker/08-ssl-connect-no-auth.py index 90cb1a7a..63c6e137 100755 --- a/test/broker/08-ssl-connect-no-auth.py +++ b/test/broker/08-ssl-connect-no-auth.py @@ -52,9 +52,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-connect-no-identity.py b/test/broker/08-ssl-connect-no-identity.py index a1cac104..0460d9e8 100755 --- a/test/broker/08-ssl-connect-no-identity.py +++ b/test/broker/08-ssl-connect-no-identity.py @@ -53,9 +53,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/08-ssl-hup-disconnect.py b/test/broker/08-ssl-hup-disconnect.py index cb87187f..2bee3584 100755 --- a/test/broker/08-ssl-hup-disconnect.py +++ b/test/broker/08-ssl-hup-disconnect.py @@ -69,9 +69,8 @@ def do_test(option): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("use_identity_as_username") diff --git a/test/broker/08-tls-psk-bridge.py b/test/broker/08-tls-psk-bridge.py index e45dd234..6e9ae144 100755 --- a/test/broker/08-tls-psk-bridge.py +++ b/test/broker/08-tls-psk-bridge.py @@ -81,11 +81,9 @@ finally: if mosq_test.wait_for_subprocess(bridge): print("bridge not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) - (stdo, stde) = bridge.communicate() - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) + print(mosq_test.broker_log(bridge)) if pub: print(pub.stdout) print(pub.stderr) diff --git a/test/broker/08-tls-psk-pub.py b/test/broker/08-tls-psk-pub.py index ea32efef..f96d60e6 100755 --- a/test/broker/08-tls-psk-pub.py +++ b/test/broker/08-tls-psk-pub.py @@ -64,9 +64,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-acl-access-variants.py b/test/broker/09-acl-access-variants.py index 59132ef7..636275b1 100755 --- a/test/broker/09-acl-access-variants.py +++ b/test/broker/09-acl-access-variants.py @@ -84,9 +84,8 @@ def acl_test(port, per_listener, global_en, user_en, pattern_en): 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')) + print(mosq_test.broker_log(broker)) exit(rc) def do_test(port, per_listener): diff --git a/test/broker/09-acl-change.py b/test/broker/09-acl-change.py index b57b756b..1c5cb841 100755 --- a/test/broker/09-acl-change.py +++ b/test/broker/09-acl-change.py @@ -117,9 +117,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) port = mosq_test.get_port() diff --git a/test/broker/09-acl-empty-file.py b/test/broker/09-acl-empty-file.py index 85c8bc74..7faa57bf 100755 --- a/test/broker/09-acl-empty-file.py +++ b/test/broker/09-acl-empty-file.py @@ -56,9 +56,8 @@ def do_test(port, per_listener): 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')) + print(mosq_test.broker_log(broker)) exit(rc) port = mosq_test.get_port() diff --git a/test/broker/09-auth-bad-method.py b/test/broker/09-auth-bad-method.py index 456d7d06..0f488ef3 100755 --- a/test/broker/09-auth-bad-method.py +++ b/test/broker/09-auth-bad-method.py @@ -27,9 +27,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/09-extended-auth-change-username.py b/test/broker/09-extended-auth-change-username.py index 7addd0f7..fd5fd993 100755 --- a/test/broker/09-extended-auth-change-username.py +++ b/test/broker/09-extended-auth-change-username.py @@ -78,9 +78,8 @@ def do_test(per_listener): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-extended-auth-multistep-reauth.py b/test/broker/09-extended-auth-multistep-reauth.py index 0b4e50bd..c84e1168 100755 --- a/test/broker/09-extended-auth-multistep-reauth.py +++ b/test/broker/09-extended-auth-multistep-reauth.py @@ -87,9 +87,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-extended-auth-multistep.py b/test/broker/09-extended-auth-multistep.py index ae534695..ae87f380 100755 --- a/test/broker/09-extended-auth-multistep.py +++ b/test/broker/09-extended-auth-multistep.py @@ -48,9 +48,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-extended-auth-reauth.py b/test/broker/09-extended-auth-reauth.py index f3326d9d..ad802b9d 100755 --- a/test/broker/09-extended-auth-reauth.py +++ b/test/broker/09-extended-auth-reauth.py @@ -43,9 +43,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-extended-auth-single.py b/test/broker/09-extended-auth-single.py index f264a84b..4ee7d635 100755 --- a/test/broker/09-extended-auth-single.py +++ b/test/broker/09-extended-auth-single.py @@ -83,9 +83,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) sys.exit(rc) diff --git a/test/broker/09-extended-auth-single2.py b/test/broker/09-extended-auth-single2.py index 022e04ef..b3d46776 100755 --- a/test/broker/09-extended-auth-single2.py +++ b/test/broker/09-extended-auth-single2.py @@ -81,9 +81,8 @@ def do_test(suffix): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("") diff --git a/test/broker/09-plugin-acl-access-variants.py b/test/broker/09-plugin-acl-access-variants.py index ecbe2ddf..2a70b3b2 100755 --- a/test/broker/09-plugin-acl-access-variants.py +++ b/test/broker/09-plugin-acl-access-variants.py @@ -87,9 +87,8 @@ def acl_test(port, per_listener, global_en, user_en, pattern_en): 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')) + print(mosq_test.broker_log(broker)) exit(rc) def do_test(port, per_listener): diff --git a/test/broker/09-plugin-acl-change.py b/test/broker/09-plugin-acl-change.py index e216e56d..a8b44d61 100755 --- a/test/broker/09-plugin-acl-change.py +++ b/test/broker/09-plugin-acl-change.py @@ -63,9 +63,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4) diff --git a/test/broker/09-plugin-auth-acl-pub-prop.py b/test/broker/09-plugin-auth-acl-pub-prop.py index 6fb6e144..689b8de2 100755 --- a/test/broker/09-plugin-auth-acl-pub-prop.py +++ b/test/broker/09-plugin-auth-acl-pub-prop.py @@ -46,9 +46,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test() diff --git a/test/broker/09-plugin-auth-acl-pub.py b/test/broker/09-plugin-auth-acl-pub.py index 8a3e346e..94de49b5 100755 --- a/test/broker/09-plugin-auth-acl-pub.py +++ b/test/broker/09-plugin-auth-acl-pub.py @@ -61,9 +61,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(2) diff --git a/test/broker/09-plugin-auth-acl-sub-denied.py b/test/broker/09-plugin-auth-acl-sub-denied.py index d51786b0..57a3813d 100755 --- a/test/broker/09-plugin-auth-acl-sub-denied.py +++ b/test/broker/09-plugin-auth-acl-sub-denied.py @@ -47,9 +47,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-acl-sub.py b/test/broker/09-plugin-auth-acl-sub.py index 78fad204..212fbf6f 100755 --- a/test/broker/09-plugin-auth-acl-sub.py +++ b/test/broker/09-plugin-auth-acl-sub.py @@ -49,9 +49,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(2) diff --git a/test/broker/09-plugin-auth-context-params.py b/test/broker/09-plugin-auth-context-params.py index 734c5225..c99052d5 100755 --- a/test/broker/09-plugin-auth-context-params.py +++ b/test/broker/09-plugin-auth-context-params.py @@ -45,9 +45,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-defer-unpwd-fail.py b/test/broker/09-plugin-auth-defer-unpwd-fail.py index 488d92d5..8d5730dc 100755 --- a/test/broker/09-plugin-auth-defer-unpwd-fail.py +++ b/test/broker/09-plugin-auth-defer-unpwd-fail.py @@ -33,9 +33,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4) diff --git a/test/broker/09-plugin-auth-defer-unpwd-success.py b/test/broker/09-plugin-auth-defer-unpwd-success.py index 7f73ee56..7fe03e4e 100755 --- a/test/broker/09-plugin-auth-defer-unpwd-success.py +++ b/test/broker/09-plugin-auth-defer-unpwd-success.py @@ -35,9 +35,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4) diff --git a/test/broker/09-plugin-auth-msg-params.py b/test/broker/09-plugin-auth-msg-params.py index c83a5388..3c1ccc7a 100755 --- a/test/broker/09-plugin-auth-msg-params.py +++ b/test/broker/09-plugin-auth-msg-params.py @@ -49,9 +49,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-unpwd-fail.py b/test/broker/09-plugin-auth-unpwd-fail.py index aaafc03f..57d36def 100755 --- a/test/broker/09-plugin-auth-unpwd-fail.py +++ b/test/broker/09-plugin-auth-unpwd-fail.py @@ -44,9 +44,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4) diff --git a/test/broker/09-plugin-auth-unpwd-success.py b/test/broker/09-plugin-auth-unpwd-success.py index 3a08fcff..5a306221 100755 --- a/test/broker/09-plugin-auth-unpwd-success.py +++ b/test/broker/09-plugin-auth-unpwd-success.py @@ -39,9 +39,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4) diff --git a/test/broker/09-plugin-auth-v2-unpwd-fail.py b/test/broker/09-plugin-auth-v2-unpwd-fail.py index 2e45de2a..a1f1f5d5 100755 --- a/test/broker/09-plugin-auth-v2-unpwd-fail.py +++ b/test/broker/09-plugin-auth-v2-unpwd-fail.py @@ -34,8 +34,7 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-v2-unpwd-success.py b/test/broker/09-plugin-auth-v2-unpwd-success.py index 792bab56..00e2ae5f 100755 --- a/test/broker/09-plugin-auth-v2-unpwd-success.py +++ b/test/broker/09-plugin-auth-v2-unpwd-success.py @@ -33,9 +33,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-v3-unpwd-fail.py b/test/broker/09-plugin-auth-v3-unpwd-fail.py index f091c276..8b0cb71d 100755 --- a/test/broker/09-plugin-auth-v3-unpwd-fail.py +++ b/test/broker/09-plugin-auth-v3-unpwd-fail.py @@ -34,8 +34,7 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-v3-unpwd-success.py b/test/broker/09-plugin-auth-v3-unpwd-success.py index ee926d1f..c434f2d4 100755 --- a/test/broker/09-plugin-auth-v3-unpwd-success.py +++ b/test/broker/09-plugin-auth-v3-unpwd-success.py @@ -33,9 +33,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-v4-unpwd-fail.py b/test/broker/09-plugin-auth-v4-unpwd-fail.py index c385b57e..fd8bc1d5 100755 --- a/test/broker/09-plugin-auth-v4-unpwd-fail.py +++ b/test/broker/09-plugin-auth-v4-unpwd-fail.py @@ -34,8 +34,7 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-v4-unpwd-success.py b/test/broker/09-plugin-auth-v4-unpwd-success.py index 9d9ee100..33c029a3 100755 --- a/test/broker/09-plugin-auth-v4-unpwd-success.py +++ b/test/broker/09-plugin-auth-v4-unpwd-success.py @@ -33,9 +33,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-v5-unpwd-fail.py b/test/broker/09-plugin-auth-v5-unpwd-fail.py index ee6db328..cb6b9291 100755 --- a/test/broker/09-plugin-auth-v5-unpwd-fail.py +++ b/test/broker/09-plugin-auth-v5-unpwd-fail.py @@ -34,8 +34,7 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-auth-v5-unpwd-success.py b/test/broker/09-plugin-auth-v5-unpwd-success.py index 08f0efa7..1134b2d6 100755 --- a/test/broker/09-plugin-auth-v5-unpwd-success.py +++ b/test/broker/09-plugin-auth-v5-unpwd-success.py @@ -33,9 +33,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-bad.py b/test/broker/09-plugin-bad.py index 950d058f..004a118a 100755 --- a/test/broker/09-plugin-bad.py +++ b/test/broker/09-plugin-bad.py @@ -26,9 +26,8 @@ def do_test(plugver, num): pass finally: os.remove(conf_file) - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("none", 1) diff --git a/test/broker/09-plugin-change-id.py b/test/broker/09-plugin-change-id.py index 330d973b..0caf756c 100755 --- a/test/broker/09-plugin-change-id.py +++ b/test/broker/09-plugin-change-id.py @@ -57,9 +57,8 @@ def do_test(plugin_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4) diff --git a/test/broker/09-plugin-delayed-auth.py b/test/broker/09-plugin-delayed-auth.py index 2ab7c97b..a12c7f1a 100755 --- a/test/broker/09-plugin-delayed-auth.py +++ b/test/broker/09-plugin-delayed-auth.py @@ -57,9 +57,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(4) diff --git a/test/broker/09-plugin-evt-client-offline.py b/test/broker/09-plugin-evt-client-offline.py index e6541a33..1beab17b 100755 --- a/test/broker/09-plugin-evt-client-offline.py +++ b/test/broker/09-plugin-evt-client-offline.py @@ -39,9 +39,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-evt-message-in.py b/test/broker/09-plugin-evt-message-in.py index b1c349c9..68ad0496 100755 --- a/test/broker/09-plugin-evt-message-in.py +++ b/test/broker/09-plugin-evt-message-in.py @@ -47,9 +47,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-evt-message-out.py b/test/broker/09-plugin-evt-message-out.py index 3f20dcc3..5d783a7b 100755 --- a/test/broker/09-plugin-evt-message-out.py +++ b/test/broker/09-plugin-evt-message-out.py @@ -54,9 +54,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-evt-psk-key.py b/test/broker/09-plugin-evt-psk-key.py index f9f241d2..1e6fa996 100755 --- a/test/broker/09-plugin-evt-psk-key.py +++ b/test/broker/09-plugin-evt-psk-key.py @@ -109,9 +109,8 @@ def do_test(per_listener_settings): os.remove(conf_file) broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode("utf-8")) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-evt-reload.py b/test/broker/09-plugin-evt-reload.py index 428bdd50..75648f7b 100755 --- a/test/broker/09-plugin-evt-reload.py +++ b/test/broker/09-plugin-evt-reload.py @@ -46,9 +46,8 @@ def do_test(per_listener_settings): os.remove(conf_file) broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("false") diff --git a/test/broker/09-plugin-evt-subscribe.py b/test/broker/09-plugin-evt-subscribe.py index b5e628c7..fff60758 100755 --- a/test/broker/09-plugin-evt-subscribe.py +++ b/test/broker/09-plugin-evt-subscribe.py @@ -46,9 +46,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-evt-tick.py b/test/broker/09-plugin-evt-tick.py index 94a120e0..f65ad0e8 100755 --- a/test/broker/09-plugin-evt-tick.py +++ b/test/broker/09-plugin-evt-tick.py @@ -43,9 +43,8 @@ def do_test(per_listener_settings): os.remove(conf_file) broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("false") diff --git a/test/broker/09-plugin-evt-unsubscribe.py b/test/broker/09-plugin-evt-unsubscribe.py index c64ff5a7..27bce1d1 100755 --- a/test/broker/09-plugin-evt-unsubscribe.py +++ b/test/broker/09-plugin-evt-unsubscribe.py @@ -47,9 +47,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-load-acl.py b/test/broker/09-plugin-load-acl.py index 86e5182b..524a6500 100755 --- a/test/broker/09-plugin-load-acl.py +++ b/test/broker/09-plugin-load-acl.py @@ -56,8 +56,7 @@ def do_test(per_listener_settings): broker.wait() if rc: print(f"per_listener_settings:{per_listener_settings}") - (stdo, stde) = broker.communicate() - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("false") diff --git a/test/broker/09-plugin-load-basic-auth.py b/test/broker/09-plugin-load-basic-auth.py index 84f5530e..91290374 100755 --- a/test/broker/09-plugin-load-basic-auth.py +++ b/test/broker/09-plugin-load-basic-auth.py @@ -103,8 +103,7 @@ def do_test(per_listener_settings, plugver): broker.wait() if rc: print(f"per_listener_settings:{per_listener_settings} plugver:{plugver}") - (stdo, stde) = broker.communicate() - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) print("T1") diff --git a/test/broker/09-plugin-load-extended-auth.py b/test/broker/09-plugin-load-extended-auth.py index c09cedff..215fa539 100755 --- a/test/broker/09-plugin-load-extended-auth.py +++ b/test/broker/09-plugin-load-extended-auth.py @@ -86,8 +86,7 @@ def do_test(per_listener_settings): broker.wait() if rc: print(f"per_listener_settings:{per_listener_settings}") - (stdo, stde) = broker.communicate() - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test("false") diff --git a/test/broker/09-plugin-publish.py b/test/broker/09-plugin-publish.py index aed5879c..e838210c 100755 --- a/test/broker/09-plugin-publish.py +++ b/test/broker/09-plugin-publish.py @@ -83,9 +83,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/09-plugin-unsupported.py b/test/broker/09-plugin-unsupported.py index a166c85c..debf6b4f 100755 --- a/test/broker/09-plugin-unsupported.py +++ b/test/broker/09-plugin-unsupported.py @@ -26,9 +26,8 @@ def do_test(plugver): pass finally: os.remove(conf_file) - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(1) diff --git a/test/broker/10-listener-mount-point.py b/test/broker/10-listener-mount-point.py index 274dbaf6..ea4ac670 100755 --- a/test/broker/10-listener-mount-point.py +++ b/test/broker/10-listener-mount-point.py @@ -73,9 +73,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/11-message-expiry.py b/test/broker/11-message-expiry.py index 2d27f625..c55968a1 100755 --- a/test/broker/11-message-expiry.py +++ b/test/broker/11-message-expiry.py @@ -99,9 +99,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) if os.path.exists('mosquitto-%d.db' % (port)): os.unlink('mosquitto-%d.db' % (port)) diff --git a/test/broker/11-persistence-autosave-changes.py b/test/broker/11-persistence-autosave-changes.py index 78ece1c7..719e0a39 100755 --- a/test/broker/11-persistence-autosave-changes.py +++ b/test/broker/11-persistence-autosave-changes.py @@ -48,11 +48,10 @@ def do_test(): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if os.path.exists('mosquitto-%d.db' % (port)): os.unlink('mosquitto-%d.db' % (port)) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/11-persistent-subscription-no-local.py b/test/broker/11-persistent-subscription-no-local.py index 89246d33..005f9db7 100755 --- a/test/broker/11-persistent-subscription-no-local.py +++ b/test/broker/11-persistent-subscription-no-local.py @@ -98,9 +98,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) if os.path.exists('mosquitto-%d.db' % (port)): os.unlink('mosquitto-%d.db' % (port)) diff --git a/test/broker/11-persistent-subscription.py b/test/broker/11-persistent-subscription.py index c0fdd658..cb03c31c 100755 --- a/test/broker/11-persistent-subscription.py +++ b/test/broker/11-persistent-subscription.py @@ -69,11 +69,10 @@ def do_test(proto_ver): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if os.path.exists('mosquitto-%d.db' % (port)): os.unlink('mosquitto-%d.db' % (port)) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/broker/11-pub-props.py b/test/broker/11-pub-props.py index 72b2e776..d0eb5c37 100755 --- a/test/broker/11-pub-props.py +++ b/test/broker/11-pub-props.py @@ -55,7 +55,7 @@ try: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo1, stde1) = broker.communicate() + stde1 = mosq_test.broker_log(broker) sock.close() broker = mosq_test.start_broker(filename=os.path.basename(__file__), use_conf=True, port=port) @@ -74,9 +74,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) if os.path.exists('mosquitto-%d.db' % (port)): os.unlink('mosquitto-%d.db' % (port)) diff --git a/test/broker/11-subscription-id.py b/test/broker/11-subscription-id.py index c5adc76f..0489d13b 100755 --- a/test/broker/11-subscription-id.py +++ b/test/broker/11-subscription-id.py @@ -79,9 +79,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) if os.path.exists('mosquitto-%d.db' % (port)): os.unlink('mosquitto-%d.db' % (port)) pass diff --git a/test/broker/12-prop-assigned-client-identifier.py b/test/broker/12-prop-assigned-client-identifier.py index c3b0c37b..96c53064 100755 --- a/test/broker/12-prop-assigned-client-identifier.py +++ b/test/broker/12-prop-assigned-client-identifier.py @@ -43,9 +43,8 @@ def do_test(start_broker, clean_start): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/12-prop-maximum-packet-size-broker.py b/test/broker/12-prop-maximum-packet-size-broker.py index 73be989c..c7dc01b6 100755 --- a/test/broker/12-prop-maximum-packet-size-broker.py +++ b/test/broker/12-prop-maximum-packet-size-broker.py @@ -42,9 +42,8 @@ finally: print("broker not terminated") if rc == 0: rc=1 os.remove(conf_file) - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/12-prop-maximum-packet-size-publish-qos1.py b/test/broker/12-prop-maximum-packet-size-publish-qos1.py index 2530a377..74d09ace 100755 --- a/test/broker/12-prop-maximum-packet-size-publish-qos1.py +++ b/test/broker/12-prop-maximum-packet-size-publish-qos1.py @@ -56,9 +56,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc; diff --git a/test/broker/12-prop-maximum-packet-size-publish-qos2.py b/test/broker/12-prop-maximum-packet-size-publish-qos2.py index 7256d254..80eb6d28 100755 --- a/test/broker/12-prop-maximum-packet-size-publish-qos2.py +++ b/test/broker/12-prop-maximum-packet-size-publish-qos2.py @@ -54,9 +54,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/12-prop-response-topic-correlation-data.py b/test/broker/12-prop-response-topic-correlation-data.py index 2734350e..a51c25fb 100755 --- a/test/broker/12-prop-response-topic-correlation-data.py +++ b/test/broker/12-prop-response-topic-correlation-data.py @@ -57,9 +57,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/12-prop-response-topic.py b/test/broker/12-prop-response-topic.py index 82783a0e..b0c057a6 100755 --- a/test/broker/12-prop-response-topic.py +++ b/test/broker/12-prop-response-topic.py @@ -56,9 +56,8 @@ def do_test(start_broker): 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')) + print(mosq_test.broker_log(broker)) exit(rc) else: return rc diff --git a/test/broker/12-prop-server-keepalive.py b/test/broker/12-prop-server-keepalive.py index e189fd11..b35ae3ad 100755 --- a/test/broker/12-prop-server-keepalive.py +++ b/test/broker/12-prop-server-keepalive.py @@ -42,8 +42,7 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/13-websocket-bad-origin.py b/test/broker/13-websocket-bad-origin.py index 5c5c062f..44be6986 100755 --- a/test/broker/13-websocket-bad-origin.py +++ b/test/broker/13-websocket-bad-origin.py @@ -85,8 +85,7 @@ finally: 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: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-acl.py b/test/broker/14-dynsec-acl.py index 8bcf7129..5c53a810 100755 --- a/test/broker/14-dynsec-acl.py +++ b/test/broker/14-dynsec-acl.py @@ -401,9 +401,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-allow-wildcard.py b/test/broker/14-dynsec-allow-wildcard.py index 5486e3c0..ee3c8332 100755 --- a/test/broker/14-dynsec-allow-wildcard.py +++ b/test/broker/14-dynsec-allow-wildcard.py @@ -128,9 +128,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-anon-group.py b/test/broker/14-dynsec-anon-group.py index cf5b515d..67410645 100755 --- a/test/broker/14-dynsec-anon-group.py +++ b/test/broker/14-dynsec-anon-group.py @@ -165,9 +165,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-auth.py b/test/broker/14-dynsec-auth.py index cde07081..5c4cc2ba 100755 --- a/test/broker/14-dynsec-auth.py +++ b/test/broker/14-dynsec-auth.py @@ -181,9 +181,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-client-invalid.py b/test/broker/14-dynsec-client-invalid.py index 31535805..77c75ebf 100755 --- a/test/broker/14-dynsec-client-invalid.py +++ b/test/broker/14-dynsec-client-invalid.py @@ -453,9 +453,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-client.py b/test/broker/14-dynsec-client.py index 1ecb8be0..fb973bc1 100755 --- a/test/broker/14-dynsec-client.py +++ b/test/broker/14-dynsec-client.py @@ -140,9 +140,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-config-init-env.py b/test/broker/14-dynsec-config-init-env.py index 801871bf..81fccd23 100755 --- a/test/broker/14-dynsec-config-init-env.py +++ b/test/broker/14-dynsec-config-init-env.py @@ -50,9 +50,8 @@ finally: os.rmdir(f"{port}") broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-config-init-file.py b/test/broker/14-dynsec-config-init-file.py index 574fd808..45b0da54 100755 --- a/test/broker/14-dynsec-config-init-file.py +++ b/test/broker/14-dynsec-config-init-file.py @@ -51,9 +51,8 @@ finally: os.rmdir(f"{port}") broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-config-init-random.py b/test/broker/14-dynsec-config-init-random.py index a0934881..eb36bd29 100755 --- a/test/broker/14-dynsec-config-init-random.py +++ b/test/broker/14-dynsec-config-init-random.py @@ -73,9 +73,8 @@ finally: os.rmdir(f"{port}") broker.terminate() broker.wait() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-default-access.py b/test/broker/14-dynsec-default-access.py index ce79e7ef..be8e9fae 100755 --- a/test/broker/14-dynsec-default-access.py +++ b/test/broker/14-dynsec-default-access.py @@ -192,9 +192,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-disable-client.py b/test/broker/14-dynsec-disable-client.py index 7c8b11b4..8589eef9 100755 --- a/test/broker/14-dynsec-disable-client.py +++ b/test/broker/14-dynsec-disable-client.py @@ -110,9 +110,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-group-invalid.py b/test/broker/14-dynsec-group-invalid.py index 663a7bb4..2fd36e26 100755 --- a/test/broker/14-dynsec-group-invalid.py +++ b/test/broker/14-dynsec-group-invalid.py @@ -425,9 +425,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-group.py b/test/broker/14-dynsec-group.py index d0f2b66f..c5bef7ed 100755 --- a/test/broker/14-dynsec-group.py +++ b/test/broker/14-dynsec-group.py @@ -200,9 +200,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-modify-client.py b/test/broker/14-dynsec-modify-client.py index 46641b6f..51cff612 100755 --- a/test/broker/14-dynsec-modify-client.py +++ b/test/broker/14-dynsec-modify-client.py @@ -210,9 +210,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-modify-group.py b/test/broker/14-dynsec-modify-group.py index cbe5db88..d8bb97c5 100755 --- a/test/broker/14-dynsec-modify-group.py +++ b/test/broker/14-dynsec-modify-group.py @@ -199,9 +199,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-modify-role.py b/test/broker/14-dynsec-modify-role.py index 94eb350c..f9001dc3 100755 --- a/test/broker/14-dynsec-modify-role.py +++ b/test/broker/14-dynsec-modify-role.py @@ -162,9 +162,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-plugin-invalid.py b/test/broker/14-dynsec-plugin-invalid.py index 8c36f50e..2daa9964 100755 --- a/test/broker/14-dynsec-plugin-invalid.py +++ b/test/broker/14-dynsec-plugin-invalid.py @@ -136,9 +136,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-role-invalid.py b/test/broker/14-dynsec-role-invalid.py index 5a761ac9..05e738bd 100755 --- a/test/broker/14-dynsec-role-invalid.py +++ b/test/broker/14-dynsec-role-invalid.py @@ -311,9 +311,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/14-dynsec-role.py b/test/broker/14-dynsec-role.py index 197c1d2d..92ca077f 100755 --- a/test/broker/14-dynsec-role.py +++ b/test/broker/14-dynsec-role.py @@ -267,9 +267,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-bridge-queue.py b/test/broker/15-persist-bridge-queue.py index 0186cb5e..c8576cac 100755 --- a/test/broker/15-persist-bridge-queue.py +++ b/test/broker/15-persist-bridge-queue.py @@ -232,13 +232,13 @@ def do_test(test_case_name: str, bridging_add_config: dict, target_add_config: d if mosq_test.wait_for_subprocess(broker): if rc == 0: rc = 1 - (_, stde) = broker.communicate() + stde = mosq_test.broker_log(broker) if bridge_target_broker is not None: bridge_target_broker.terminate() if mosq_test.wait_for_subprocess(bridge_target_broker): if rc == 0: rc = 1 - (_, stde2) = bridge_target_broker.communicate() + stde2 = mosq_test.broker_log(bridge_target_broker) os.remove(conf_file_bridge_target) os.remove(conf_file) rc += persist_help.cleanup(bridge_target_port) @@ -248,13 +248,13 @@ def do_test(test_case_name: str, bridging_add_config: dict, target_add_config: d if rc: if stde2 is not None: print("Bridge target brocker log:") - print(stde2.decode("utf-8")) + print(stde2) if stde3 is not None: print("Bridging brocker log (first run):") - print(stde3.decode("utf-8")) + print(stde3) if stde is not None: print("Bridging brocker log:") - print(stde.decode("utf-8")) + print(stde) assert rc == 0, f"rc: {rc}" diff --git a/test/broker/15-persist-client-drop-expired-messages.py b/test/broker/15-persist-client-drop-expired-messages.py index ff807b73..6a920e5e 100755 --- a/test/broker/15-persist-client-drop-expired-messages.py +++ b/test/broker/15-persist-client-drop-expired-messages.py @@ -157,12 +157,11 @@ def do_test( if mosq_test.wait_for_subprocess(broker): if rc == 0: rc = 1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode("utf-8")) + print(mosq_test.broker_log(broker)) assert rc == 0, f"rc: {rc}" diff --git a/test/broker/15-persist-client-expired-session.py b/test/broker/15-persist-client-expired-session.py index e42f4d59..992fcfe1 100755 --- a/test/broker/15-persist-client-expired-session.py +++ b/test/broker/15-persist-client-expired-session.py @@ -190,12 +190,11 @@ def do_test( if mosq_test.wait_for_subprocess(broker): if rc == 0: rc = 1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode("utf-8")) + print(mosq_test.broker_log(broker)) assert rc == 0, f"rc: {rc}" diff --git a/test/broker/15-persist-client-msg-in-v3-1-1.py b/test/broker/15-persist-client-msg-in-v3-1-1.py index 72eb95f3..ec0e0883 100755 --- a/test/broker/15-persist-client-msg-in-v3-1-1.py +++ b/test/broker/15-persist-client-msg-in-v3-1-1.py @@ -94,12 +94,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-msg-in-v5-0.py b/test/broker/15-persist-client-msg-in-v5-0.py index 8b5edb8d..64999104 100755 --- a/test/broker/15-persist-client-msg-in-v5-0.py +++ b/test/broker/15-persist-client-msg-in-v5-0.py @@ -93,12 +93,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-msg-modify-acl.py b/test/broker/15-persist-client-msg-modify-acl.py index 6bde82d2..000cc463 100755 --- a/test/broker/15-persist-client-msg-modify-acl.py +++ b/test/broker/15-persist-client-msg-modify-acl.py @@ -182,14 +182,13 @@ def do_test(test_case_name: str, additional_config_entries: dict): if mosq_test.wait_for_subprocess(broker): if rc == 0: rc = 1 - (_, stde) = broker.communicate() os.remove(acl_file) os.remove(conf_file) rc += persist_help.cleanup(port) print(f"{test_case_name}") if rc: - print(stde.decode("utf-8")) + print(mosq_test.broker_log(broker)) assert rc == 0, f"rc: {rc}" diff --git a/test/broker/15-persist-client-msg-out-clear-v3-1-1.py b/test/broker/15-persist-client-msg-out-clear-v3-1-1.py index ea0bac2b..03f9ea6d 100755 --- a/test/broker/15-persist-client-msg-out-clear-v3-1-1.py +++ b/test/broker/15-persist-client-msg-out-clear-v3-1-1.py @@ -100,12 +100,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-msg-out-dup-v3-1-1.py b/test/broker/15-persist-client-msg-out-dup-v3-1-1.py index 08be6c2c..c97e5bd8 100755 --- a/test/broker/15-persist-client-msg-out-dup-v3-1-1.py +++ b/test/broker/15-persist-client-msg-out-dup-v3-1-1.py @@ -94,11 +94,10 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-msg-out-queue-v3-1-1.py b/test/broker/15-persist-client-msg-out-queue-v3-1-1.py index 72184af6..0e4f7274 100755 --- a/test/broker/15-persist-client-msg-out-queue-v3-1-1.py +++ b/test/broker/15-persist-client-msg-out-queue-v3-1-1.py @@ -102,12 +102,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-msg-out-v3-1-1-db.py b/test/broker/15-persist-client-msg-out-v3-1-1-db.py index 0cdc883b..e5671340 100755 --- a/test/broker/15-persist-client-msg-out-v3-1-1-db.py +++ b/test/broker/15-persist-client-msg-out-v3-1-1-db.py @@ -72,12 +72,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-msg-out-v3-1-1.py b/test/broker/15-persist-client-msg-out-v3-1-1.py index 69aad769..b1f7013c 100755 --- a/test/broker/15-persist-client-msg-out-v3-1-1.py +++ b/test/broker/15-persist-client-msg-out-v3-1-1.py @@ -98,12 +98,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-msg-out-v5-0.py b/test/broker/15-persist-client-msg-out-v5-0.py index 6b7c8730..fa332134 100755 --- a/test/broker/15-persist-client-msg-out-v5-0.py +++ b/test/broker/15-persist-client-msg-out-v5-0.py @@ -108,12 +108,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-v3-1-1.py b/test/broker/15-persist-client-v3-1-1.py index 3a62aff9..5f003fb8 100755 --- a/test/broker/15-persist-client-v3-1-1.py +++ b/test/broker/15-persist-client-v3-1-1.py @@ -81,12 +81,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (3)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-v5-0.py b/test/broker/15-persist-client-v5-0.py index 529b35af..04c68ad3 100755 --- a/test/broker/15-persist-client-v5-0.py +++ b/test/broker/15-persist-client-v5-0.py @@ -84,12 +84,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-client-will.py b/test/broker/15-persist-client-will.py index d77de62b..260825b4 100755 --- a/test/broker/15-persist-client-will.py +++ b/test/broker/15-persist-client-will.py @@ -175,7 +175,7 @@ def do_test( # Kill the broker broker.kill() - (_, stde) = broker.communicate() + stde = mosq_test.broker_log(broker) broker = None if will_sent and will_qos > 0: @@ -225,7 +225,7 @@ def do_test( if mosq_test.wait_for_subprocess(broker): if rc == 0: rc = 1 - (_, stde3) = broker.communicate() + stde3 = mosq_test.broker_log(broker) if not stde: stde = stde3 else: @@ -235,10 +235,10 @@ def do_test( if rc: if stde: - print(stde.decode("utf-8")) + print(stde) if stde2: print("Broker after restart") - print(stde2.decode("utf-8")) + print(stde2) # assert rc == 0, f"rc: {rc}" diff --git a/test/broker/15-persist-migrate-db.py b/test/broker/15-persist-migrate-db.py index c1dd4241..4330c373 100755 --- a/test/broker/15-persist-migrate-db.py +++ b/test/broker/15-persist-migrate-db.py @@ -45,12 +45,11 @@ def do_success_test(create_db_of_version: list[int]): print("broker not terminated") if rc == 0: rc = 1 - (_, stde) = broker.communicate() rc += persist_help.cleanup(port) if rc: - print(stde.decode("utf-8")) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-publish-properties-v5-0.py b/test/broker/15-persist-publish-properties-v5-0.py index 93e5cfdd..7c9402c6 100755 --- a/test/broker/15-persist-publish-properties-v5-0.py +++ b/test/broker/15-persist-publish-properties-v5-0.py @@ -90,12 +90,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-retain-clear.py b/test/broker/15-persist-retain-clear.py index 1e15d65b..4012d757 100755 --- a/test/broker/15-persist-retain-clear.py +++ b/test/broker/15-persist-retain-clear.py @@ -101,12 +101,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-retain-v3-1-1.py b/test/broker/15-persist-retain-v3-1-1.py index 787ee6d7..17fd9d1d 100755 --- a/test/broker/15-persist-retain-v3-1-1.py +++ b/test/broker/15-persist-retain-v3-1-1.py @@ -83,12 +83,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-retain-v5-0.py b/test/broker/15-persist-retain-v5-0.py index 748d8d82..ab775698 100755 --- a/test/broker/15-persist-retain-v5-0.py +++ b/test/broker/15-persist-retain-v5-0.py @@ -83,12 +83,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (2)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-subscription-v3-1-1.py b/test/broker/15-persist-subscription-v3-1-1.py index 64159aa5..25ce5c46 100755 --- a/test/broker/15-persist-subscription-v3-1-1.py +++ b/test/broker/15-persist-subscription-v3-1-1.py @@ -135,12 +135,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (3)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/15-persist-subscription-v5-0.py b/test/broker/15-persist-subscription-v5-0.py index 3717021c..e5a10fcf 100755 --- a/test/broker/15-persist-subscription-v5-0.py +++ b/test/broker/15-persist-subscription-v5-0.py @@ -134,12 +134,11 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated (3)") if rc == 0: rc=1 - (_, stde) = broker.communicate() os.remove(conf_file) rc += persist_help.cleanup(port) if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/16-config-includedir.py b/test/broker/16-config-includedir.py index 86acca46..d60f6ef7 100755 --- a/test/broker/16-config-includedir.py +++ b/test/broker/16-config-includedir.py @@ -43,9 +43,8 @@ def do_test(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/17-control-list-listeners.py b/test/broker/17-control-list-listeners.py index 7ad0f648..e386abd0 100755 --- a/test/broker/17-control-list-listeners.py +++ b/test/broker/17-control-list-listeners.py @@ -159,9 +159,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/17-control-list-plugins.py b/test/broker/17-control-list-plugins.py index 88e1f0e7..1e6d9f3b 100755 --- a/test/broker/17-control-list-plugins.py +++ b/test/broker/17-control-list-plugins.py @@ -98,9 +98,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/17-control-missing-endpoint.py b/test/broker/17-control-missing-endpoint.py index 53652e49..000574e8 100755 --- a/test/broker/17-control-missing-endpoint.py +++ b/test/broker/17-control-missing-endpoint.py @@ -58,9 +58,8 @@ finally: 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/broker/20-sparkplug-aware.py b/test/broker/20-sparkplug-aware.py index d45596be..73765234 100755 --- a/test/broker/20-sparkplug-aware.py +++ b/test/broker/20-sparkplug-aware.py @@ -247,9 +247,8 @@ def do_tests(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) if __name__ == '__main__': diff --git a/test/broker/20-sparkplug-compliance.py b/test/broker/20-sparkplug-compliance.py index 59f39abc..e2db45b1 100755 --- a/test/broker/20-sparkplug-compliance.py +++ b/test/broker/20-sparkplug-compliance.py @@ -81,9 +81,8 @@ def do_tests(): 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')) + print(mosq_test.broker_log(broker)) exit(rc) if __name__ == '__main__': diff --git a/test/broker/21-proxy-v1-bad.py b/test/broker/21-proxy-v1-bad.py index 0ead57af..0ecd8b88 100755 --- a/test/broker/21-proxy-v1-bad.py +++ b/test/broker/21-proxy-v1-bad.py @@ -44,9 +44,9 @@ def do_test(data, expect_log): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) print(data) exit(1) diff --git a/test/broker/21-proxy-v1-success.py b/test/broker/21-proxy-v1-success.py index ca34ee85..36561fff 100755 --- a/test/broker/21-proxy-v1-success.py +++ b/test/broker/21-proxy-v1-success.py @@ -41,9 +41,9 @@ def do_test(data, expect_log): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) exit(1) do_test(b"PROXY TCP4 192.0.2.5 127.0.0.1 6275 1234\r\n", "New client connected from 192.0.2.5:6275") diff --git a/test/broker/21-proxy-v2-bad-header.py b/test/broker/21-proxy-v2-bad-header.py index c42d8eac..31ec8ae2 100755 --- a/test/broker/21-proxy-v2-bad-header.py +++ b/test/broker/21-proxy-v2-bad-header.py @@ -48,9 +48,8 @@ def do_test(headers): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ipv4.py b/test/broker/21-proxy-v2-ipv4.py index 23e81900..fca9a7ef 100755 --- a/test/broker/21-proxy-v2-ipv4.py +++ b/test/broker/21-proxy-v2-ipv4.py @@ -43,9 +43,9 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 diff --git a/test/broker/21-proxy-v2-ipv6.py b/test/broker/21-proxy-v2-ipv6.py index d2257c25..32c6a864 100755 --- a/test/broker/21-proxy-v2-ipv6.py +++ b/test/broker/21-proxy-v2-ipv6.py @@ -45,9 +45,9 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expected_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expected_log not in stde: + print(stde) rc = 1 diff --git a/test/broker/21-proxy-v2-local.py b/test/broker/21-proxy-v2-local.py index 38ff5001..aefeb858 100755 --- a/test/broker/21-proxy-v2-local.py +++ b/test/broker/21-proxy-v2-local.py @@ -44,9 +44,8 @@ def do_test(header): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-long-tlv.py b/test/broker/21-proxy-v2-long-tlv.py index a3f6f8bb..39bfd596 100755 --- a/test/broker/21-proxy-v2-long-tlv.py +++ b/test/broker/21-proxy-v2-long-tlv.py @@ -47,9 +47,9 @@ def do_test(fam): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 do_test(PROXY_FAM_IPV4) diff --git a/test/broker/21-proxy-v2-lost-connection.py b/test/broker/21-proxy-v2-lost-connection.py index 03f88e0d..d1987d7b 100755 --- a/test/broker/21-proxy-v2-lost-connection.py +++ b/test/broker/21-proxy-v2-lost-connection.py @@ -42,9 +42,8 @@ def do_test(header): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ssl-cipher.py b/test/broker/21-proxy-v2-ssl-cipher.py index 0c1db31c..869ea8a1 100755 --- a/test/broker/21-proxy-v2-ssl-cipher.py +++ b/test/broker/21-proxy-v2-ssl-cipher.py @@ -42,9 +42,9 @@ def do_test(data): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ssl-common-name-failure.py b/test/broker/21-proxy-v2-ssl-common-name-failure.py index d864dcce..5f26e3e7 100755 --- a/test/broker/21-proxy-v2-ssl-common-name-failure.py +++ b/test/broker/21-proxy-v2-ssl-common-name-failure.py @@ -48,9 +48,9 @@ def do_test(data, expect_log): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) print(expect_log) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ssl-common-name-success.py b/test/broker/21-proxy-v2-ssl-common-name-success.py index f4c79ed5..c1a7ac50 100755 --- a/test/broker/21-proxy-v2-ssl-common-name-success.py +++ b/test/broker/21-proxy-v2-ssl-common-name-success.py @@ -44,9 +44,9 @@ def do_test(data): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ssl-require-cert-failure.py b/test/broker/21-proxy-v2-ssl-require-cert-failure.py index bef81c76..60c29c11 100755 --- a/test/broker/21-proxy-v2-ssl-require-cert-failure.py +++ b/test/broker/21-proxy-v2-ssl-require-cert-failure.py @@ -43,9 +43,9 @@ def do_test(data): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ssl-require-cert-success.py b/test/broker/21-proxy-v2-ssl-require-cert-success.py index 3ca03d2b..eaafa087 100755 --- a/test/broker/21-proxy-v2-ssl-require-cert-success.py +++ b/test/broker/21-proxy-v2-ssl-require-cert-success.py @@ -43,9 +43,9 @@ def do_test(data): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ssl-require-tls-failure.py b/test/broker/21-proxy-v2-ssl-require-tls-failure.py index 21b29f87..be2fc2bd 100755 --- a/test/broker/21-proxy-v2-ssl-require-tls-failure.py +++ b/test/broker/21-proxy-v2-ssl-require-tls-failure.py @@ -43,9 +43,9 @@ def do_test(data): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-ssl-require-tls-success.py b/test/broker/21-proxy-v2-ssl-require-tls-success.py index dcf93eb0..f0264b1a 100755 --- a/test/broker/21-proxy-v2-ssl-require-tls-success.py +++ b/test/broker/21-proxy-v2-ssl-require-tls-success.py @@ -43,9 +43,9 @@ def do_test(data): if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 raise ValueError(rc) diff --git a/test/broker/21-proxy-v2-unix.py b/test/broker/21-proxy-v2-unix.py index 643e4a95..7467f839 100755 --- a/test/broker/21-proxy-v2-unix.py +++ b/test/broker/21-proxy-v2-unix.py @@ -43,9 +43,9 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expected_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expected_log not in stde: + print(stde) rc = 1 diff --git a/test/broker/21-proxy-v2-websockets.py b/test/broker/21-proxy-v2-websockets.py index 7e74abaa..06c8a644 100755 --- a/test/broker/21-proxy-v2-websockets.py +++ b/test/broker/21-proxy-v2-websockets.py @@ -78,9 +78,9 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() - if rc != 0 or expect_log not in stde.decode('utf-8'): - print(stde.decode('utf-8')) + stde = mosq_test.broker_log(broker) + if rc != 0 or expect_log not in stde: + print(stde) rc = 1 diff --git a/test/broker/22-http-api-acl.py b/test/broker/22-http-api-acl.py index ec8a9d88..3c419ac2 100755 --- a/test/broker/22-http-api-acl.py +++ b/test/broker/22-http-api-acl.py @@ -62,9 +62,8 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 diff --git a/test/broker/22-http-api-api.py b/test/broker/22-http-api-api.py index 9cabea3d..fe0fe472 100755 --- a/test/broker/22-http-api-api.py +++ b/test/broker/22-http-api-api.py @@ -193,9 +193,8 @@ finally: os.remove(f"{mqtt_port}.sock") except FileNotFoundError: pass - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 diff --git a/test/broker/22-http-api-auth.py b/test/broker/22-http-api-auth.py index c23a0036..33aa15b6 100755 --- a/test/broker/22-http-api-auth.py +++ b/test/broker/22-http-api-auth.py @@ -73,9 +73,8 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 diff --git a/test/broker/22-http-api-file.py b/test/broker/22-http-api-file.py index 60d281a0..6e78b2f1 100755 --- a/test/broker/22-http-api-file.py +++ b/test/broker/22-http-api-file.py @@ -82,9 +82,8 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 diff --git a/test/broker/22-http-api-tls.py b/test/broker/22-http-api-tls.py index b6f53889..c9cec365 100755 --- a/test/broker/22-http-api-tls.py +++ b/test/broker/22-http-api-tls.py @@ -176,9 +176,8 @@ finally: if mosq_test.wait_for_subprocess(broker): print("broker not terminated") if rc == 0: rc=1 - (stdo, stde) = broker.communicate() if rc != 0: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) rc = 1 diff --git a/test/broker/23-security-acl-file-reload.py b/test/broker/23-security-acl-file-reload.py index 1b95d163..7aa47f92 100755 --- a/test/broker/23-security-acl-file-reload.py +++ b/test/broker/23-security-acl-file-reload.py @@ -53,9 +53,8 @@ def do_test(write_config_func): os.remove(conf_file) os.remove(f"{port}.acl") broker.terminate() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(write_config_default) diff --git a/test/broker/23-security-password-file-reload.py b/test/broker/23-security-password-file-reload.py index 2f44eac4..a0233c86 100755 --- a/test/broker/23-security-password-file-reload.py +++ b/test/broker/23-security-password-file-reload.py @@ -53,9 +53,8 @@ def do_test(write_config_func): os.remove(conf_file) os.remove(f"{port}.password") broker.terminate() - (stdo, stde) = broker.communicate() if rc: - print(stde.decode('utf-8')) + print(mosq_test.broker_log(broker)) exit(rc) do_test(write_config_default) diff --git a/test/broker/mosq_test_helper.py b/test/broker/mosq_test_helper.py index 68fbd3bb..585be31b 100644 --- a/test/broker/mosq_test_helper.py +++ b/test/broker/mosq_test_helper.py @@ -69,14 +69,14 @@ def do_test_broker_failure( expect_fail=True, cmd_args=cmd_args, ) - (stdo, stde) = broker.communicate() + stde = mosq_test.broker_log(broker) if broker.returncode != rc_expected: print(f"Expected broker return code {rc_expected}, got {broker.returncode}") - print(stde.decode("utf-8")) + print(stde) return rc if error_log_entry is not None: - error_log = stde.decode("utf-8") + error_log = stde if error_log_entry not in error_log: print( f"Error log entry: '{error_log_entry}' not found in '{error_log}'" @@ -84,6 +84,7 @@ def do_test_broker_failure( return rc if stdout_entry is not None: + (stdo, _) = broker.communicate() stdout_log = stdo.decode("utf-8") if stdout_entry not in stdout_log: print( diff --git a/test/client/02-subscribe-env.py b/test/client/02-subscribe-env.py index 521f6d86..3e1b366a 100755 --- a/test/client/02-subscribe-env.py +++ b/test/client/02-subscribe-env.py @@ -58,9 +58,8 @@ def do_test(proto_ver, env): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/client/02-subscribe-format.py b/test/client/02-subscribe-format.py index 6bc85b48..6f4500c6 100755 --- a/test/client/02-subscribe-format.py +++ b/test/client/02-subscribe-format.py @@ -77,9 +77,8 @@ def do_test(format_str, expected_output, proto_ver=4, payload="message"): 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')) + print(mosq_test.broker_log(broker)) exit(rc) diff --git a/test/client/03-publish-env.py b/test/client/03-publish-env.py index 4fca7f8d..9fffa93b 100755 --- a/test/client/03-publish-env.py +++ b/test/client/03-publish-env.py @@ -56,9 +56,8 @@ def do_test(proto_ver, env): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/client/03-publish-file.py b/test/client/03-publish-file.py index c34f671e..3d85cfb7 100755 --- a/test/client/03-publish-file.py +++ b/test/client/03-publish-file.py @@ -66,9 +66,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/client/04-rr-env.py b/test/client/04-rr-env.py index c7123594..49c13607 100755 --- a/test/client/04-rr-env.py +++ b/test/client/04-rr-env.py @@ -71,9 +71,8 @@ def do_test(proto_ver, env): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/client/04-rr-qos1-ws.py b/test/client/04-rr-qos1-ws.py index 1b079e4a..f380de86 100755 --- a/test/client/04-rr-qos1-ws.py +++ b/test/client/04-rr-qos1-ws.py @@ -84,9 +84,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/client/04-rr-qos1.py b/test/client/04-rr-qos1.py index a74b9dd7..c1d75630 100755 --- a/test/client/04-rr-qos1.py +++ b/test/client/04-rr-qos1.py @@ -73,9 +73,8 @@ def do_test(proto_ver): 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')) + print(mosq_test.broker_log(broker)) print("proto_ver=%d" % (proto_ver)) exit(rc) diff --git a/test/mosq_test.py b/test/mosq_test.py index 4e38cfbf..c44c6683 100644 --- a/test/mosq_test.py +++ b/test/mosq_test.py @@ -8,6 +8,7 @@ import socket import subprocess import struct import sys +import tempfile import time import uuid @@ -74,6 +75,13 @@ def listen_sock(port): sock.listen(5) return sock +def broker_log(broker): + try: + broker.mosq_log.seek(0) + return broker.mosq_log.read().decode('utf-8') + except AttributeError: + return None + def start_broker(filename, cmd=None, port=0, use_conf=False, expect_fail=False, expect_fail_log=None, nolog=False, checkhost="localhost", env=None, check_port=True, cmd_args=None, timeout=0.1): global vg_index global vg_logfiles @@ -110,22 +118,18 @@ def start_broker(filename, cmd=None, port=0, use_conf=False, expect_fail=False, if cmd_args: cmd.extend(cmd_args) - #print(port) - #print(cmd) - if nolog: - stderr = subprocess.DEVNULL - else: - stderr = subprocess.PIPE + stderr = tempfile.TemporaryFile(prefix=str(port), suffix=".log") env = env_add_ld_library_path(env) broker = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=stderr, env=env) + broker.mosq_log = stderr if expect_fail: try: broker.wait(timeout*10) if expect_fail_log is not None: - (_, stde) = broker.communicate() - if expect_fail_log not in stde.decode('utf-8'): + stde = broker_log(broker) + if expect_fail_log not in stde: print(f"{expect_fail_log} not found in log.") print(stde.decode('utf-8')) raise ValueError() @@ -154,8 +158,8 @@ def start_broker(filename, cmd=None, port=0, use_conf=False, expect_fail=False, return broker if expect_fail == False: - outs, errs = broker.communicate(timeout=timeout) - print(f"FAIL: unable to start broker: {errs.decode('utf-8')}") + stde = broker_log(broker) + print(f"FAIL: unable to start broker: {stde}") raise IOError else: return broker