From 5e601c385329ce2df55644773ec8decbeff2d982 Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Sat, 29 Jan 2022 08:49:06 +0000 Subject: [PATCH] Library connect tests. --- test/lib/01-con-discon-success-v5.py | 58 +++++++++++++++++++++ test/lib/01-con-discon-will-clear.py | 50 ++++++++++++++++++ test/lib/01-con-discon-will-v5.py | 51 ++++++++++++++++++ test/lib/01-con-discon-will.py | 50 ++++++++++++++++++ test/lib/Makefile | 4 ++ test/lib/c/01-con-discon-success-v5.c | 65 +++++++++++++++++++++++ test/lib/c/01-con-discon-will-clear.c | 61 ++++++++++++++++++++++ test/lib/c/01-con-discon-will-v5.c | 75 +++++++++++++++++++++++++++ test/lib/c/01-con-discon-will.c | 62 ++++++++++++++++++++++ test/lib/c/Makefile | 4 ++ test/lib/test.py | 4 ++ 11 files changed, 484 insertions(+) create mode 100755 test/lib/01-con-discon-success-v5.py create mode 100755 test/lib/01-con-discon-will-clear.py create mode 100755 test/lib/01-con-discon-will-v5.py create mode 100755 test/lib/01-con-discon-will.py create mode 100644 test/lib/c/01-con-discon-success-v5.c create mode 100644 test/lib/c/01-con-discon-will-clear.c create mode 100644 test/lib/c/01-con-discon-will-v5.c create mode 100644 test/lib/c/01-con-discon-will.c diff --git a/test/lib/01-con-discon-success-v5.py b/test/lib/01-con-discon-success-v5.py new file mode 100755 index 00000000..13d856a1 --- /dev/null +++ b/test/lib/01-con-discon-success-v5.py @@ -0,0 +1,58 @@ +#!/usr/bin/env python3 + +# Test whether a client produces a correct connect and subsequent disconnect. + +# The client should connect to port 1888 with keepalive=60, clean session set, +# and client id 01-con-discon-success +# The test will send a CONNACK message to the client with rc=0. Upon receiving +# the CONNACK and verifying that rc=0, the client should send a DISCONNECT +# message. If rc!=0, the client should exit with an error. + +from mosq_test_helper import * + +port = mosq_test.get_lib_port() + +rc = 1 +keepalive = 60 +props = mqtt5_props.gen_uint32_prop(mqtt5_props.PROP_MAXIMUM_PACKET_SIZE, 1000) +props += mqtt5_props.gen_uint16_prop(mqtt5_props.PROP_RECEIVE_MAXIMUM, 20) +connect_packet = mosq_test.gen_connect("01-con-discon-success-v5", keepalive=keepalive, proto_ver=5, properties=props) +connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5) + +disconnect_packet = mosq_test.gen_disconnect(proto_ver=5) + +sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) +sock.settimeout(10) +sock.bind(('', port)) +sock.listen(5) + +client_args = sys.argv[1:] +env = dict(os.environ) +env['LD_LIBRARY_PATH'] = '../../lib:../../lib/cpp' +try: + pp = env['PYTHONPATH'] +except KeyError: + pp = '' +env['PYTHONPATH'] = '../../lib/python:'+pp + +client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port) + +try: + (conn, address) = sock.accept() + conn.settimeout(10) + + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 + + conn.close() +except mosq_test.TestError: + pass +finally: + #client.terminate() + client.wait() + sock.close() + +exit(rc) + diff --git a/test/lib/01-con-discon-will-clear.py b/test/lib/01-con-discon-will-clear.py new file mode 100755 index 00000000..3c381f7f --- /dev/null +++ b/test/lib/01-con-discon-will-clear.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 + +# Test whether a client produces a correct connect and subsequent disconnect, with setting a will then clearing it. + +from mosq_test_helper import * + +port = mosq_test.get_lib_port() + +rc = 1 +keepalive = 60 +connect_packet = mosq_test.gen_connect("01-con-discon-will", keepalive=keepalive) +connack_packet = mosq_test.gen_connack(rc=0) + +disconnect_packet = mosq_test.gen_disconnect() + +sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) +sock.settimeout(10) +sock.bind(('', port)) +sock.listen(5) + +client_args = sys.argv[1:] +env = dict(os.environ) +env['LD_LIBRARY_PATH'] = '../../lib:../../lib/cpp' +try: + pp = env['PYTHONPATH'] +except KeyError: + pp = '' +env['PYTHONPATH'] = '../../lib/python:'+pp + +client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port) + +try: + (conn, address) = sock.accept() + conn.settimeout(10) + + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 + + conn.close() +except mosq_test.TestError: + pass +finally: + #client.terminate() + client.wait() + sock.close() + +exit(rc) + diff --git a/test/lib/01-con-discon-will-v5.py b/test/lib/01-con-discon-will-v5.py new file mode 100755 index 00000000..87f0ffce --- /dev/null +++ b/test/lib/01-con-discon-will-v5.py @@ -0,0 +1,51 @@ +#!/usr/bin/env python3 + +# Test whether a client produces a correct connect and subsequent disconnect, with a will, MQTT v5 + +from mosq_test_helper import * + +port = mosq_test.get_lib_port() + +rc = 1 +keepalive = 60 +props = mqtt5_props.gen_byte_prop(mqtt5_props.PROP_PAYLOAD_FORMAT_INDICATOR, 0x01) +connect_packet = mosq_test.gen_connect("01-con-discon-will", keepalive=keepalive, will_topic="will/topic", will_payload=b"will-payload", will_qos=1, will_retain=True, will_properties=props, proto_ver=5) +connack_packet = mosq_test.gen_connack(rc=0, proto_ver=5) + +disconnect_packet = mosq_test.gen_disconnect() + +sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) +sock.settimeout(10) +sock.bind(('', port)) +sock.listen(5) + +client_args = sys.argv[1:] +env = dict(os.environ) +env['LD_LIBRARY_PATH'] = '../../lib:../../lib/cpp' +try: + pp = env['PYTHONPATH'] +except KeyError: + pp = '' +env['PYTHONPATH'] = '../../lib/python:'+pp + +client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port) + +try: + (conn, address) = sock.accept() + conn.settimeout(10) + + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 + + conn.close() +except mosq_test.TestError: + pass +finally: + #client.terminate() + client.wait() + sock.close() + +exit(rc) + diff --git a/test/lib/01-con-discon-will.py b/test/lib/01-con-discon-will.py new file mode 100755 index 00000000..c650488c --- /dev/null +++ b/test/lib/01-con-discon-will.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python3 + +# Test whether a client produces a correct connect and subsequent disconnect, with a will. + +from mosq_test_helper import * + +port = mosq_test.get_lib_port() + +rc = 1 +keepalive = 60 +connect_packet = mosq_test.gen_connect("01-con-discon-will", keepalive=keepalive, will_topic="will/topic", will_payload=b"will-payload", will_qos=1, will_retain=True) +connack_packet = mosq_test.gen_connack(rc=0) + +disconnect_packet = mosq_test.gen_disconnect() + +sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) +sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) +sock.settimeout(10) +sock.bind(('', port)) +sock.listen(5) + +client_args = sys.argv[1:] +env = dict(os.environ) +env['LD_LIBRARY_PATH'] = '../../lib:../../lib/cpp' +try: + pp = env['PYTHONPATH'] +except KeyError: + pp = '' +env['PYTHONPATH'] = '../../lib/python:'+pp + +client = mosq_test.start_client(filename=sys.argv[1].replace('/', '-'), cmd=client_args, env=env, port=port) + +try: + (conn, address) = sock.accept() + conn.settimeout(10) + + mosq_test.do_receive_send(conn, connect_packet, connack_packet, "connect") + mosq_test.expect_packet(conn, "disconnect", disconnect_packet) + rc = 0 + + conn.close() +except mosq_test.TestError: + pass +finally: + #client.terminate() + client.wait() + sock.close() + +exit(rc) + diff --git a/test/lib/Makefile b/test/lib/Makefile index 732812f7..6775013a 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -24,6 +24,10 @@ test-compile-cpp : c : test-compile ./01-con-discon-success.py $@/01-con-discon-success.test + ./01-con-discon-success-v5.py $@/01-con-discon-success-v5.test + ./01-con-discon-will.py $@/01-con-discon-will.test + ./01-con-discon-will-v5.py $@/01-con-discon-will-v5.test + ./01-con-discon-will-clear.py $@/01-con-discon-will-clear.test ./01-keepalive-pingreq.py $@/01-keepalive-pingreq.test ./01-no-clean-session.py $@/01-no-clean-session.test ./01-server-keepalive-pingreq.py $@/01-server-keepalive-pingreq.test diff --git a/test/lib/c/01-con-discon-success-v5.c b/test/lib/c/01-con-discon-success-v5.c new file mode 100644 index 00000000..35dc656b --- /dev/null +++ b/test/lib/c/01-con-discon-success-v5.c @@ -0,0 +1,65 @@ +#include +#include +#include +#include +#include + +static int run = -1; + +static void on_connect(struct mosquitto *mosq, void *obj, int rc, int flags, const mosquitto_property *properties) +{ + (void)obj; + + /* FIXME - should verify flags and all properties here. */ + if(rc){ + exit(1); + }else{ + mosquitto_disconnect(mosq); + } +} + +static void on_disconnect(struct mosquitto *mosq, void *obj, int rc, const mosquitto_property *properties) +{ + (void)mosq; + (void)obj; + + /* FIXME - should verify flags and all properties here. */ + run = rc; +} + +int main(int argc, char *argv[]) +{ + int rc; + struct mosquitto *mosq; + int port; + mosquitto_property *props = NULL; + + if(argc < 2){ + return 1; + } + port = atoi(argv[1]); + + mosquitto_lib_init(); + + mosq = mosquitto_new("01-con-discon-success-v5", true, NULL); + if(mosq == NULL){ + return 1; + } + mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, 5); + mosquitto_connect_v5_callback_set(mosq, on_connect); + mosquitto_disconnect_v5_callback_set(mosq, on_disconnect); + + mosquitto_property_add_int32(&props, MQTT_PROP_MAXIMUM_PACKET_SIZE, 1000); + rc = mosquitto_connect_bind_v5(mosq, "localhost", port, 60, NULL, props); + mosquitto_property_free_all(&props); + if(rc != MOSQ_ERR_SUCCESS) return rc; + + while(run == -1){ + mosquitto_loop(mosq, -1, 1); + } + + mosquitto_destroy(mosq); + + mosquitto_lib_cleanup(); + return run; +} diff --git a/test/lib/c/01-con-discon-will-clear.c b/test/lib/c/01-con-discon-will-clear.c new file mode 100644 index 00000000..920ba418 --- /dev/null +++ b/test/lib/c/01-con-discon-will-clear.c @@ -0,0 +1,61 @@ +#include +#include +#include +#include +#include + +static int run = -1; + +static void on_connect(struct mosquitto *mosq, void *obj, int rc) +{ + (void)obj; + + if(rc){ + exit(1); + }else{ + mosquitto_disconnect(mosq); + } +} + +static void on_disconnect(struct mosquitto *mosq, void *obj, int rc) +{ + (void)mosq; + (void)obj; + + run = rc; +} + +int main(int argc, char *argv[]) +{ + int rc; + struct mosquitto *mosq; + int port; + + if(argc < 2){ + return 1; + } + port = atoi(argv[1]); + + mosquitto_lib_init(); + + mosq = mosquitto_new("01-con-discon-will", true, NULL); + if(mosq == NULL){ + return 1; + } + mosquitto_will_set(mosq, "will/topic", strlen("will-payload"), "will-payload", 1, true); + mosquitto_will_clear(mosq); + mosquitto_connect_callback_set(mosq, on_connect); + mosquitto_disconnect_callback_set(mosq, on_disconnect); + + rc = mosquitto_connect(mosq, "localhost", port, 60); + if(rc != MOSQ_ERR_SUCCESS) return rc; + + while(run == -1){ + mosquitto_loop(mosq, -1, 1); + } + + mosquitto_destroy(mosq); + + mosquitto_lib_cleanup(); + return run; +} diff --git a/test/lib/c/01-con-discon-will-v5.c b/test/lib/c/01-con-discon-will-v5.c new file mode 100644 index 00000000..b4199cf7 --- /dev/null +++ b/test/lib/c/01-con-discon-will-v5.c @@ -0,0 +1,75 @@ +#include +#include +#include +#include +#include +#include + +static int run = -1; + +static void on_connect(struct mosquitto *mosq, void *obj, int rc) +{ + (void)obj; + + if(rc){ + exit(1); + }else{ + mosquitto_disconnect(mosq); + } +} + +static void on_disconnect(struct mosquitto *mosq, void *obj, int rc) +{ + (void)mosq; + (void)obj; + + run = rc; +} + +int main(int argc, char *argv[]) +{ + int rc; + struct mosquitto *mosq; + int port; + mosquitto_property *proplist = NULL; + + if(argc < 2){ + return 1; + } + port = atoi(argv[1]); + + mosquitto_lib_init(); + + mosq = mosquitto_new("01-con-discon-will", true, NULL); + if(mosq == NULL){ + return 1; + } + mosquitto_int_option(mosq, MOSQ_OPT_PROTOCOL_VERSION, MQTT_PROTOCOL_V5); + + rc = mosquitto_property_add_byte(&proplist, MQTT_PROP_PAYLOAD_FORMAT_INDICATOR, 1); + if(rc != MOSQ_ERR_SUCCESS){ + abort(); + } + /* Set twice, so it has to clear the old settings */ + mosquitto_will_set_v5(mosq, "will/topic", strlen("will-payload"), "will-payload", 1, true, proplist); + proplist = NULL; + rc = mosquitto_property_add_byte(&proplist, MQTT_PROP_PAYLOAD_FORMAT_INDICATOR, 1); + if(rc != MOSQ_ERR_SUCCESS){ + abort(); + } + mosquitto_will_set_v5(mosq, "will/topic", strlen("will-payload"), "will-payload", 1, true, proplist); + mosquitto_connect_callback_set(mosq, on_connect); + mosquitto_disconnect_callback_set(mosq, on_disconnect); + + rc = mosquitto_connect(mosq, "localhost", port, 60); + if(rc != MOSQ_ERR_SUCCESS) return rc; + + while(run == -1){ + mosquitto_loop(mosq, -1, 1); + } + + mosquitto_destroy(mosq); + + mosquitto_lib_cleanup(); + return run; +} diff --git a/test/lib/c/01-con-discon-will.c b/test/lib/c/01-con-discon-will.c new file mode 100644 index 00000000..03095e7a --- /dev/null +++ b/test/lib/c/01-con-discon-will.c @@ -0,0 +1,62 @@ +#include +#include +#include +#include +#include + +static int run = -1; + +static void on_connect(struct mosquitto *mosq, void *obj, int rc) +{ + (void)obj; + + if(rc){ + exit(1); + }else{ + mosquitto_disconnect(mosq); + } +} + +static void on_disconnect(struct mosquitto *mosq, void *obj, int rc) +{ + (void)mosq; + (void)obj; + + run = rc; +} + +int main(int argc, char *argv[]) +{ + int rc; + struct mosquitto *mosq; + int port; + + if(argc < 2){ + return 1; + } + port = atoi(argv[1]); + + mosquitto_lib_init(); + + mosq = mosquitto_new("01-con-discon-will", true, NULL); + if(mosq == NULL){ + return 1; + } + /* Set twice, so it has to clear the old settings */ + mosquitto_will_set(mosq, "will/topic", strlen("will-payload"), "will-payload", 1, true); + mosquitto_will_set(mosq, "will/topic", strlen("will-payload"), "will-payload", 1, true); + mosquitto_connect_callback_set(mosq, on_connect); + mosquitto_disconnect_callback_set(mosq, on_disconnect); + + rc = mosquitto_connect(mosq, "localhost", port, 60); + if(rc != MOSQ_ERR_SUCCESS) return rc; + + while(run == -1){ + mosquitto_loop(mosq, -1, 1); + } + + mosquitto_destroy(mosq); + + mosquitto_lib_cleanup(); + return run; +} diff --git a/test/lib/c/Makefile b/test/lib/c/Makefile index 084f0d7a..c2ebfa20 100644 --- a/test/lib/c/Makefile +++ b/test/lib/c/Makefile @@ -5,6 +5,10 @@ LIBS=../../../lib/libmosquitto.so.1 SRC = \ 01-con-discon-success.c \ + 01-con-discon-success-v5.c \ + 01-con-discon-will.c \ + 01-con-discon-will-v5.c \ + 01-con-discon-will-clear.c \ 01-keepalive-pingreq.c \ 01-no-clean-session.c \ 01-pre-connect-callback.c \ diff --git a/test/lib/test.py b/test/lib/test.py index eb56e718..700f8c36 100755 --- a/test/lib/test.py +++ b/test/lib/test.py @@ -5,6 +5,10 @@ import ptest tests = [ (1, ['./01-con-discon-success.py', 'c/01-con-discon-success.test']), + (1, ['./01-con-discon-success-v5.py', 'c/01-con-discon-success-v5.test']), + (1, ['./01-con-discon-will.py', 'c/01-con-discon-will.test']), + (1, ['./01-con-discon-will-v5.py', 'c/01-con-discon-will-v5.test']), + (1, ['./01-con-discon-will-clear.py', 'c/01-con-discon-will-clear.test']), (1, ['./01-keepalive-pingreq.py', 'c/01-keepalive-pingreq.test']), (1, ['./01-no-clean-session.py', 'c/01-no-clean-session.test']), (1, ['./01-server-keepalive-pingreq.py', 'c/01-server-keepalive-pingreq.test']),