mosquitto_pub stdin file and line tests.

test/client/03-publish-stdin-file.py

@@ -0,0 +1,62 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(proto_ver):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    if proto_ver == 5:
+        V = 'mqttv5'
+    elif proto_ver == 4:
+        V = 'mqttv311'
+    else:
+        V = 'mqttv31'
+
+    env = {
+            'LD_LIBRARY_PATH':'../../lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_pub',
+            '-p', str(port),
+            '-q', '1',
+            '-t', '03/pub/stdin/file/test',
+            '-s',
+            '-V', V
+            ]
+
+    publish_packet = mosq_test.gen_publish("03/pub/stdin/file/test", qos=0, payload="message1\nmessage2", proto_ver=proto_ver)
+
+    broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port)
+
+    try:
+        sock = mosq_test.sub_helper(port=port, topic="#", qos=0, proto_ver=proto_ver)
+
+        pub = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=env)
+        pub.stdin.write(b'message1\nmessage2')
+        pub.stdin.close()
+        pub.wait()
+
+        mosq_test.expect_packet(sock, "publish", publish_packet)
+        rc = 0
+        sock.close()
+    except mosq_test.TestError:
+        pass
+    except Exception as e:
+        print(e)
+    finally:
+        broker.terminate()
+        broker.wait()
+        (stdo, stde) = broker.communicate()
+        if rc:
+            print(stde.decode('utf-8'))
+            print("proto_ver=%d" % (proto_ver))
+            exit(rc)
+
+
+do_test(proto_ver=3)
+do_test(proto_ver=4)
+do_test(proto_ver=5)

test/client/03-publish-stdin-line.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(proto_ver):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    if proto_ver == 5:
+        V = 'mqttv5'
+    elif proto_ver == 4:
+        V = 'mqttv311'
+    else:
+        V = 'mqttv31'
+
+    env = {
+            'LD_LIBRARY_PATH':'../../lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_pub',
+            '-p', str(port),
+            '-q', '2',
+            '-t', '03/pub/stdin/line/test',
+            '-l',
+            '-V', V
+            ]
+
+    publish_packet1 = mosq_test.gen_publish("03/pub/stdin/line/test", qos=0, payload="message1", proto_ver=proto_ver)
+    publish_packet2 = mosq_test.gen_publish("03/pub/stdin/line/test", qos=0, payload="message2", proto_ver=proto_ver)
+
+    broker = mosq_test.start_broker(filename=os.path.basename(__file__), port=port)
+
+    try:
+        sock = mosq_test.sub_helper(port=port, topic="#", qos=0, proto_ver=proto_ver)
+
+        pub = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, env=env)
+        pub.stdin.write(b'message1\nmessage2')
+        pub.stdin.close()
+        pub.wait()
+
+        mosq_test.expect_packet(sock, "publish", publish_packet1)
+        mosq_test.expect_packet(sock, "publish", publish_packet2)
+        rc = 0
+        sock.close()
+    except mosq_test.TestError:
+        pass
+    except Exception as e:
+        print(e)
+    finally:
+        broker.terminate()
+        broker.wait()
+        (stdo, stde) = broker.communicate()
+        if rc:
+            print(stde.decode('utf-8'))
+            print("proto_ver=%d" % (proto_ver))
+            exit(rc)
+
+
+do_test(proto_ver=3)
+do_test(proto_ver=4)
+do_test(proto_ver=5)

test/client/Makefile

@@ -21,6 +21,8 @@ test : 02 03
 	./03-publish-qos1-properties.py
 	./03-publish-qos1.py
 	./03-publish-socks.py
+	./03-publish-stdin-file.py
+	./03-publish-stdin-line.py
 
 ptest :
 	./test.sh

test/client/test.py

@@ -17,6 +17,8 @@ tests = [
     (1, './03-publish-qos1-properties.py'),
     (1, './03-publish-qos1.py'),
     (2, './03-publish-socks.py'),
+	(1, './03-publish-stdin-file.py'),
+	(1, './03-publish-stdin-line.py'),
     ]
 
 ptest.run_tests(tests)