Split client python tests into test with/without TLS/PSK

Signed-off-by: Norbert Heusser <norbert.heusser@cedalo.com>

test/client/02-subscribe-argv-errors-tls-psk.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(args, stderr_expected, rc_expected):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    env = {
+            'LD_LIBRARY_PATH': mosq_test.get_build_root() + '/lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_sub'] + args
+
+    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+    if mosq_test.wait_for_subprocess(sub):
+        print("sub not terminated")
+        raise mosq_test.TestError(1)
+    (stdo, stde) = sub.communicate()
+    if sub.returncode != rc_expected:
+        raise mosq_test.TestError(sub.returncode)
+    if stderr_expected is not None and stde.decode('utf-8') != stderr_expected:
+        raise mosq_test.TestError(stde)
+
+
+if __name__ == '__main__':
+    helps = "\nUse 'mosquitto_sub --help' to see usage.\n"
+
+    # Missing args for TLS-PSK related options
+    do_test(['--psk'], "Error: --psk argument given but no key specified.\n\n" + helps, 1)
+    do_test(['--psk-identity'], "Error: --psk-identity argument given but no identity specified.\n\n" + helps, 1)

test/client/02-subscribe-argv-errors-tls.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(args, stderr_expected, rc_expected):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    env = {
+            'LD_LIBRARY_PATH': mosq_test.get_build_root() + '/lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_sub'] + args
+
+    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+    if mosq_test.wait_for_subprocess(sub):
+        print("sub not terminated")
+        raise mosq_test.TestError(1)
+    (stdo, stde) = sub.communicate()
+    if sub.returncode != rc_expected:
+        raise mosq_test.TestError(sub.returncode)
+    if stderr_expected is not None and stde.decode('utf-8') != stderr_expected:
+        raise mosq_test.TestError(stde)
+
+
+if __name__ == '__main__':
+    helps = "\nUse 'mosquitto_sub --help' to see usage.\n"
+
+    # Missing args for TLS related options
+    do_test(['--cafile'], "Error: --cafile argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--capath'], "Error: --capath argument given but no directory specified.\n\n" + helps, 1)
+    do_test(['--cert'], "Error: --cert argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--ciphers'], "Error: --ciphers argument given but no ciphers specified.\n\n" + helps, 1)
+    do_test(['--key'], "Error: --key argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--keyform'], "Error: --keyform argument given but no keyform specified.\n\n" + helps, 1)
+    do_test(['--tls-alpn'], "Error: --tls-alpn argument given but no protocol specified.\n\n" + helps, 1)
+    do_test(['--tls-engine'], "Error: --tls-engine argument given but no engine_id specified.\n\n" + helps, 1)
+    do_test(['--tls-engine-kpass-sha1'], "Error: --tls-engine-kpass-sha1 argument given but no kpass sha1 specified.\n\n" + helps, 1)
+    do_test(['--tls-version'], "Error: --tls-version argument given but no version specified.\n\n" + helps, 1)

test/client/02-subscribe-argv-errors-without-tls.py

@@ -34,32 +34,20 @@ if __name__ == '__main__':
 
     # Missing args
     do_test(['-A'], "Error: -A argument given but no address specified.\n\n" + helps, 1)
-    do_test(['--cafile'], "Error: --cafile argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--capath'], "Error: --capath argument given but no directory specified.\n\n" + helps, 1)
-    do_test(['--cert'], "Error: --cert argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--ciphers'], "Error: --ciphers argument given but no ciphers specified.\n\n" + helps, 1)
     do_test(['-C'], "Error: -C argument given but no count specified.\n\n" + helps, 1)
     do_test(['-h'], "Error: -h argument given but no host specified.\n\n" + helps, 1)
     do_test(['-i'], "Error: -i argument given but no id specified.\n\n" + helps, 1)
     do_test(['-I'], "Error: -I argument given but no id prefix specified.\n\n" + helps, 1)
     do_test(['-k'], "Error: -k argument given but no keepalive specified.\n\n" + helps, 1)
-    do_test(['--key'], "Error: --key argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--keyform'], "Error: --keyform argument given but no keyform specified.\n\n" + helps, 1)
     do_test(['-L'], "Error: -L argument given but no URL specified.\n\n" + helps, 1)
     do_test(['-M'], "Error: -M argument given but max_inflight not specified.\n\n" + helps, 1)
     do_test(['-o'], "Error: -o argument given but no options file specified.\n\n" + helps, 1)
     do_test(['-p'], "Error: -p argument given but no port specified.\n\n" + helps, 1)
     do_test(['-P'], "Error: -P argument given but no password specified.\n\n" + helps, 1)
     do_test(['--proxy'], "Error: --proxy argument given but no proxy url specified.\n\n" + helps, 1)
-    do_test(['--psk'], "Error: --psk argument given but no key specified.\n\n" + helps, 1)
-    do_test(['--psk-identity'], "Error: --psk-identity argument given but no identity specified.\n\n" + helps, 1)
     do_test(['--random-filter'], "Error: --random-filter argument given but no chance specified.\n\n" + helps, 1)
     do_test(['-q'], "Error: -q argument given but no QoS specified.\n\n" + helps, 1)
     do_test(['-t'], "Error: -t argument given but no topic specified.\n\n" + helps, 1)
-    do_test(['--tls-alpn'], "Error: --tls-alpn argument given but no protocol specified.\n\n" + helps, 1)
-    do_test(['--tls-engine'], "Error: --tls-engine argument given but no engine_id specified.\n\n" + helps, 1)
-    do_test(['--tls-engine-kpass-sha1'], "Error: --tls-engine-kpass-sha1 argument given but no kpass sha1 specified.\n\n" + helps, 1)
-    do_test(['--tls-version'], "Error: --tls-version argument given but no version specified.\n\n" + helps, 1)
     do_test(['-u'], "Error: -u argument given but no username specified.\n\n" + helps, 1)
     do_test(['--unix'], "Error: --unix argument given but no socket path specified.\n\n" + helps, 1)
     do_test(['-V'], "Error: --protocol-version argument given but no version specified.\n\n" + helps, 1)

test/client/03-publish-argv-errors-tls-psk.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(args, stderr_expected, rc_expected):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    env = {
+            'LD_LIBRARY_PATH': mosq_test.get_build_root() + '/lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_pub'] + args
+
+    pub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+    if mosq_test.wait_for_subprocess(pub):
+        print("pub not terminated")
+        raise mosq_test.TestError(1)
+    (stdo, stde) = pub.communicate()
+    if pub.returncode != rc_expected:
+        raise mosq_test.TestError(pub.returncode)
+    if stderr_expected is not None and stde.decode('utf-8') != stderr_expected:
+        raise mosq_test.TestError(stde)
+
+
+if __name__ == '__main__':
+    helps = "\nUse 'mosquitto_pub --help' to see usage.\n"
+
+    # Missing args
+    do_test(['--psk'], "Error: --psk argument given but no key specified.\n\n" + helps, 1)
+    do_test(['--psk-identity'], "Error: --psk-identity argument given but no identity specified.\n\n" + helps, 1)
+
+    # Invalid combinations
+    do_test(['--cafile', 'file', '--psk', 'key'], "Error: Only one of --psk or --cafile/--capath may be used at once.\n" + helps, 1)
+    do_test(['--capath', 'dir', '--psk', 'key'], "Error: Only one of --psk or --cafile/--capath may be used at once.\n" + helps, 1)
+    do_test(['--psk', 'key'], "Error: --psk-identity required if --psk used.\n" + helps, 1)
+    

test/client/03-publish-argv-errors-tls.py

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(args, stderr_expected, rc_expected):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    env = {
+            'LD_LIBRARY_PATH': mosq_test.get_build_root() + '/lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_pub'] + args
+
+    pub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+    if mosq_test.wait_for_subprocess(pub):
+        print("pub not terminated")
+        raise mosq_test.TestError(1)
+    (stdo, stde) = pub.communicate()
+    if pub.returncode != rc_expected:
+        raise mosq_test.TestError(pub.returncode)
+    if stderr_expected is not None and stde.decode('utf-8') != stderr_expected:
+        raise mosq_test.TestError(stde)
+
+
+if __name__ == '__main__':
+    helps = "\nUse 'mosquitto_pub --help' to see usage.\n"
+
+    # Missing args
+    do_test(['--cafile'], "Error: --cafile argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--capath'], "Error: --capath argument given but no directory specified.\n\n" + helps, 1)
+    do_test(['--cert'], "Error: --cert argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--ciphers'], "Error: --ciphers argument given but no ciphers specified.\n\n" + helps, 1)
+    do_test(['--key'], "Error: --key argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--keyform'], "Error: --keyform argument given but no keyform specified.\n\n" + helps, 1)
+    do_test(['--tls-alpn'], "Error: --tls-alpn argument given but no protocol specified.\n\n" + helps, 1)
+    do_test(['--tls-engine'], "Error: --tls-engine argument given but no engine_id specified.\n\n" + helps, 1)
+    do_test(['--tls-engine-kpass-sha1'], "Error: --tls-engine-kpass-sha1 argument given but no kpass sha1 specified.\n\n" + helps, 1)
+    do_test(['--tls-version'], "Error: --tls-version argument given but no version specified.\n\n" + helps, 1)
+
+    # Invalid combinations
+    do_test(['--cert', 'file'], "Error: Both certfile and keyfile must be provided if one of them is set.\n" + helps, 1)
+    do_test(['--key', 'file'], "Error: Both certfile and keyfile must be provided if one of them is set.\n" + helps, 1)
+    do_test(['--keyform', 'file'], "Error: If keyform is set, keyfile must be also specified.\n" + helps, 1)
+    do_test(['--tls-engine-kpass-sha1', 'hash'], "Error: when using tls-engine-kpass-sha1, both tls-engine and keyform must also be provided.\n" + helps, 1)
+
+    # Invalid values
+    do_test(['-t','topic','-m','1', '--cafile', 'missing'], "Error: Problem setting TLS options: File not found.\n", 1)
+

test/client/03-publish-argv-errors-without-tls.py

@@ -31,20 +31,14 @@ if __name__ == '__main__':
 
     # Usage, ignore actual text though.
     do_test(['--help'], None, 1)
-
+    
     # Missing args
     do_test(['-A'], "Error: -A argument given but no address specified.\n\n" + helps, 1)
-    do_test(['--cafile'], "Error: --cafile argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--capath'], "Error: --capath argument given but no directory specified.\n\n" + helps, 1)
-    do_test(['--cert'], "Error: --cert argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--ciphers'], "Error: --ciphers argument given but no ciphers specified.\n\n" + helps, 1)
     do_test(['-f'], "Error: -f argument given but no file specified.\n\n" + helps, 1)
     do_test(['-h'], "Error: -h argument given but no host specified.\n\n" + helps, 1)
     do_test(['-i'], "Error: -i argument given but no id specified.\n\n" + helps, 1)
     do_test(['-I'], "Error: -I argument given but no id prefix specified.\n\n" + helps, 1)
     do_test(['-k'], "Error: -k argument given but no keepalive specified.\n\n" + helps, 1)
-    do_test(['--key'], "Error: --key argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--keyform'], "Error: --keyform argument given but no keyform specified.\n\n" + helps, 1)
     do_test(['-L'], "Error: -L argument given but no URL specified.\n\n" + helps, 1)
     do_test(['-M'], "Error: -M argument given but max_inflight not specified.\n\n" + helps, 1)
     do_test(['-m'], "Error: -m argument given but no message specified.\n\n" + helps, 1)
@@ -52,16 +46,10 @@ if __name__ == '__main__':
     do_test(['-p'], "Error: -p argument given but no port specified.\n\n" + helps, 1)
     do_test(['-P'], "Error: -P argument given but no password specified.\n\n" + helps, 1)
     do_test(['--proxy'], "Error: --proxy argument given but no proxy url specified.\n\n" + helps, 1)
-    do_test(['--psk'], "Error: --psk argument given but no key specified.\n\n" + helps, 1)
-    do_test(['--psk-identity'], "Error: --psk-identity argument given but no identity specified.\n\n" + helps, 1)
     do_test(['-q'], "Error: -q argument given but no QoS specified.\n\n" + helps, 1)
     do_test(['--repeat'], "Error: --repeat argument given but no count specified.\n\n" + helps, 1)
     do_test(['--repeat-delay'], "Error: --repeat-delay argument given but no time specified.\n\n" + helps, 1)
     do_test(['-t'], "Error: -t argument given but no topic specified.\n\n" + helps, 1)
-    do_test(['--tls-alpn'], "Error: --tls-alpn argument given but no protocol specified.\n\n" + helps, 1)
-    do_test(['--tls-engine'], "Error: --tls-engine argument given but no engine_id specified.\n\n" + helps, 1)
-    do_test(['--tls-engine-kpass-sha1'], "Error: --tls-engine-kpass-sha1 argument given but no kpass sha1 specified.\n\n" + helps, 1)
-    do_test(['--tls-version'], "Error: --tls-version argument given but no version specified.\n\n" + helps, 1)
     do_test(['-u'], "Error: -u argument given but no username specified.\n\n" + helps, 1)
     do_test(['--unix'], "Error: --unix argument given but no socket path specified.\n\n" + helps, 1)
     do_test(['-V'], "Error: --protocol-version argument given but no version specified.\n\n" + helps, 1)
@@ -83,13 +71,6 @@ if __name__ == '__main__':
     do_test(['-I', 'id-prefix', '-i', 'id'], "Error: -i and -I argument cannot be used together.\n\n" + helps, 1)
     do_test(['--will-payload', 'payload'], "Error: Will payload given, but no will topic given.\n" + helps, 1)
     do_test(['--will-retain'], "Error: Will retain given, but no will topic given.\n" + helps, 1)
-    do_test(['--cert', 'file'], "Error: Both certfile and keyfile must be provided if one of them is set.\n" + helps, 1)
-    do_test(['--key', 'file'], "Error: Both certfile and keyfile must be provided if one of them is set.\n" + helps, 1)
-    do_test(['--keyform', 'file'], "Error: If keyform is set, keyfile must be also specified.\n" + helps, 1)
-    do_test(['--tls-engine-kpass-sha1', 'hash'], "Error: when using tls-engine-kpass-sha1, both tls-engine and keyform must also be provided.\n" + helps, 1)
-    do_test(['--cafile', 'file', '--psk', 'key'], "Error: Only one of --psk or --cafile/--capath may be used at once.\n" + helps, 1)
-    do_test(['--capath', 'dir', '--psk', 'key'], "Error: Only one of --psk or --cafile/--capath may be used at once.\n" + helps, 1)
-    do_test(['--psk', 'key'], "Error: --psk-identity required if --psk used.\n" + helps, 1)
     do_test(['-V', 'mqttv5', '-x', '-1'], "Error: You must provide a client id if you are using an infinite session expiry interval.\n" + helps, 1)
     do_test(['-V', 'mqttv311', '-c'], "Error: You must provide a client id if you are using the -c option.\n" + helps, 1)
 
@@ -120,7 +101,6 @@ if __name__ == '__main__':
     do_test(['-V', '5', '-D', 'connect', 'session-expiry-interval', '-1'], "Error: Property value (-1) out of range for property session-expiry-interval.\n\n" + helps, 1)
     do_test(['-V', '5', '-D', 'connect', 'session-expiry-interval', '4294967296'], "Error: Property value (4294967296) out of range for property session-expiry-interval.\n\n" + helps, 1)
     do_test(['-V', '5', '-D', 'publish', 'subscription-identifier', '1'], "Error: subscription-identifier property not supported for publish in --property argument.\n\n" + helps, 1)
-    do_test(['-t','topic','-m','1', '--cafile', 'missing'], "Error: Problem setting TLS options: File not found.\n", 1)
 
     # Unknown options
     do_test(['--unknown'], "Error: Unknown option '--unknown'.\n" + helps, 1)

test/client/04-rr-argv-errors-tls-psk.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(args, stderr_expected, rc_expected):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    env = {
+            'LD_LIBRARY_PATH': mosq_test.get_build_root() + '/lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_rr'] + args
+
+    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+    sub.wait()
+    (stdo, stde) = sub.communicate()
+    if sub.returncode != rc_expected:
+        raise mosq_test.TestError(sub.returncode)
+    if stderr_expected is not None and stde.decode('utf-8') != stderr_expected:
+        raise mosq_test.TestError(stde)
+
+
+if __name__ == '__main__':
+    helps = "\nUse 'mosquitto_rr --help' to see usage.\n"
+
+    # Missing args for TLS-PSK related options
+    do_test(['--psk'], "Error: --psk argument given but no key specified.\n\n" + helps, 1)
+    do_test(['--psk-identity'], "Error: --psk-identity argument given but no identity specified.\n\n" + helps, 1)

test/client/04-rr-argv-errors-tls.py

@@ -0,0 +1,40 @@
+#!/usr/bin/env python3
+
+#
+
+from mosq_test_helper import *
+
+def do_test(args, stderr_expected, rc_expected):
+    rc = 1
+
+    port = mosq_test.get_port()
+
+    env = {
+            'LD_LIBRARY_PATH': mosq_test.get_build_root() + '/lib',
+            'XDG_CONFIG_HOME':'/tmp/missing'
+            }
+    cmd = ['../../client/mosquitto_rr'] + args
+
+    sub = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
+    sub.wait()
+    (stdo, stde) = sub.communicate()
+    if sub.returncode != rc_expected:
+        raise mosq_test.TestError(sub.returncode)
+    if stderr_expected is not None and stde.decode('utf-8') != stderr_expected:
+        raise mosq_test.TestError(stde)
+
+
+if __name__ == '__main__':
+    helps = "\nUse 'mosquitto_rr --help' to see usage.\n"
+
+    # Missing args for TLS related options
+    do_test(['--cafile'], "Error: --cafile argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--capath'], "Error: --capath argument given but no directory specified.\n\n" + helps, 1)
+    do_test(['--cert'], "Error: --cert argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--ciphers'], "Error: --ciphers argument given but no ciphers specified.\n\n" + helps, 1)
+    do_test(['--key'], "Error: --key argument given but no file specified.\n\n" + helps, 1)
+    do_test(['--keyform'], "Error: --keyform argument given but no keyform specified.\n\n" + helps, 1)
+    do_test(['--tls-alpn'], "Error: --tls-alpn argument given but no protocol specified.\n\n" + helps, 1)
+    do_test(['--tls-engine'], "Error: --tls-engine argument given but no engine_id specified.\n\n" + helps, 1)
+    do_test(['--tls-engine-kpass-sha1'], "Error: --tls-engine-kpass-sha1 argument given but no kpass sha1 specified.\n\n" + helps, 1)
+    do_test(['--tls-version'], "Error: --tls-version argument given but no version specified.\n\n" + helps, 1)

test/client/04-rr-argv-errors-without-tls.py

@@ -32,17 +32,11 @@ if __name__ == '__main__':
 
     # Missing args
     do_test(['-A'], "Error: -A argument given but no address specified.\n\n" + helps, 1)
-    do_test(['--cafile'], "Error: --cafile argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--capath'], "Error: --capath argument given but no directory specified.\n\n" + helps, 1)
-    do_test(['--cert'], "Error: --cert argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--ciphers'], "Error: --ciphers argument given but no ciphers specified.\n\n" + helps, 1)
     do_test(['-e'], "Error: -e argument given but no response topic specified.\n\n" + helps, 1)
     do_test(['-h'], "Error: -h argument given but no host specified.\n\n" + helps, 1)
     do_test(['-i'], "Error: -i argument given but no id specified.\n\n" + helps, 1)
     do_test(['-I'], "Error: -I argument given but no id prefix specified.\n\n" + helps, 1)
     do_test(['-k'], "Error: -k argument given but no keepalive specified.\n\n" + helps, 1)
-    do_test(['--key'], "Error: --key argument given but no file specified.\n\n" + helps, 1)
-    do_test(['--keyform'], "Error: --keyform argument given but no keyform specified.\n\n" + helps, 1)
     do_test(['-L'], "Error: -L argument given but no URL specified.\n\n" + helps, 1)
     do_test(['-M'], "Error: -M argument given but max_inflight not specified.\n\n" + helps, 1)
     do_test(['-m'], "Error: -m argument given but no message specified.\n\n" + helps, 1)
@@ -50,14 +44,8 @@ if __name__ == '__main__':
     do_test(['-p'], "Error: -p argument given but no port specified.\n\n" + helps, 1)
     do_test(['-P'], "Error: -P argument given but no password specified.\n\n" + helps, 1)
     do_test(['--proxy'], "Error: --proxy argument given but no proxy url specified.\n\n" + helps, 1)
-    do_test(['--psk'], "Error: --psk argument given but no key specified.\n\n" + helps, 1)
-    do_test(['--psk-identity'], "Error: --psk-identity argument given but no identity specified.\n\n" + helps, 1)
     do_test(['-q'], "Error: -q argument given but no QoS specified.\n\n" + helps, 1)
     do_test(['-t'], "Error: -t argument given but no topic specified.\n\n" + helps, 1)
-    do_test(['--tls-alpn'], "Error: --tls-alpn argument given but no protocol specified.\n\n" + helps, 1)
-    do_test(['--tls-engine'], "Error: --tls-engine argument given but no engine_id specified.\n\n" + helps, 1)
-    do_test(['--tls-engine-kpass-sha1'], "Error: --tls-engine-kpass-sha1 argument given but no kpass sha1 specified.\n\n" + helps, 1)
-    do_test(['--tls-version'], "Error: --tls-version argument given but no version specified.\n\n" + helps, 1)
     do_test(['-u'], "Error: -u argument given but no username specified.\n\n" + helps, 1)
     do_test(['--unix'], "Error: --unix argument given but no socket path specified.\n\n" + helps, 1)
     do_test(['-V'], "Error: --protocol-version argument given but no version specified.\n\n" + helps, 1)

test/client/Makefile

@@ -9,7 +9,13 @@ test : 02 03 04
 	#./test-ws.sh
 
 02 :
-	./02-subscribe-argv-errors.py
+	./02-subscribe-argv-errors-without-tls.py
+ifeq ($(WITH_TLS),yes)
+	./02-subscribe-argv-errors-tls.py
+ifeq ($(WITH_TLS_PSK),yes)
+	./02-subscribe-argv-errors-tls-psk.py
+endif
+endif
 	./02-subscribe-filter-out.py
 	./02-subscribe-format.py
 	./02-subscribe-format-json-qos0.py
@@ -22,7 +28,13 @@ test : 02 03 04
 	./02-subscribe-verbose.py
 
 03 :
-	./03-publish-argv-errors.py
+	./03-publish-argv-errors-without-tls.py
+ifeq ($(WITH_TLS),yes)
+	./03-publish-argv-errors-tls.py
+ifeq ($(WITH_TLS_PSK),yes)
+	./03-publish-argv-errors-tls-psk.py
+endif
+endif
 	./03-publish-file-empty.py
 	./03-publish-file.py
 	./03-publish-options-file.py
@@ -36,7 +48,13 @@ test : 02 03 04
 	./03-publish-url.py
 
 04 :
-	./04-rr-argv-errors.py
+	./04-rr-argv-errors-without-tls.py
+ifeq ($(WITH_TLS),yes)
+	./04-rr-argv-errors-tls.py
+ifeq ($(WITH_TLS_PSK),yes)
+	./04-rr-argv-errors-tls-psk.py
+endif
+endif
 
 ptest :
 	./test.sh