Allow running tests in parallel (don't reuse addresses)

Author: akx

tests/lib/clients/01-asyncio.py

@@ -3,6 +3,8 @@
 
 import paho.mqtt.client as mqtt
 
+from tests.paho_test import get_test_server_port
+
 client_id = 'asyncio-test'
 
 
@@ -78,7 +80,7 @@ def on_disconnect(client, userdata, rc):
 
     _aioh = AsyncioHelper(loop, client)
 
-    client.connect('localhost', 1888, 60)
+    client.connect('localhost', get_test_server_port(), 60)
     client.socket().setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 2048)
 
     await disconnected

tests/lib/clients/01-decorators.py

@@ -1,6 +1,6 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 mqttc = mqtt.Client("decorators-test", clean_session=True)
 payload = b""
@@ -38,5 +38,5 @@ def on_disconnect(mqttc, obj, rc):
     pass  # TODO: should probably test that this gets called
 
 
-mqttc.connect("localhost", 1888)
+mqttc.connect("localhost", get_test_server_port())
 loop_until_keyboard_interrupt(mqttc)

tests/lib/clients/01-keepalive-pingreq.py

@@ -1,6 +1,6 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 
 def on_connect(mqttc, obj, flags, rc):
@@ -10,5 +10,5 @@ def on_connect(mqttc, obj, flags, rc):
 mqttc = mqtt.Client("01-keepalive-pingreq")
 mqttc.on_connect = on_connect
 
-mqttc.connect("localhost", 1888, keepalive=4)
+mqttc.connect("localhost", get_test_server_port(), keepalive=4)
 loop_until_keyboard_interrupt(mqttc)

tests/lib/clients/01-no-clean-session.py

@@ -1,8 +1,8 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 mqttc = mqtt.Client("01-no-clean-session", clean_session=False)
 
-mqttc.connect("localhost", 1888)
+mqttc.connect("localhost", get_test_server_port())
 loop_until_keyboard_interrupt(mqttc)

tests/lib/clients/01-reconnect-on-failure.py

@@ -1,6 +1,6 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import wait_for_keyboard_interrupt
+from tests.paho_test import get_test_server_port, wait_for_keyboard_interrupt
 
 
 def on_connect(mqttc, obj, flags, rc):
@@ -11,6 +11,6 @@ def on_connect(mqttc, obj, flags, rc):
 mqttc.on_connect = on_connect
 
 with wait_for_keyboard_interrupt():
-    mqttc.connect("localhost", 1888)
+    mqttc.connect("localhost", get_test_server_port())
     mqttc.loop_forever()
     exit(42)  # this is expected by the test case

tests/lib/clients/01-unpwd-empty-password-set.py

@@ -1,9 +1,9 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 mqttc = mqtt.Client("01-unpwd-set")
 
 mqttc.username_pw_set("uname", "")
-mqttc.connect("localhost", 1888)
+mqttc.connect("localhost", get_test_server_port())
 loop_until_keyboard_interrupt(mqttc)

tests/lib/clients/01-unpwd-empty-set.py

@@ -1,9 +1,9 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 mqttc = mqtt.Client("01-unpwd-set")
 
 mqttc.username_pw_set("", "")
-mqttc.connect("localhost", 1888)
+mqttc.connect("localhost", get_test_server_port())
 loop_until_keyboard_interrupt(mqttc)

tests/lib/clients/01-unpwd-set.py

@@ -1,9 +1,9 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 mqttc = mqtt.Client("01-unpwd-set")
 
 mqttc.username_pw_set("uname", ";'[08gn=#")
-mqttc.connect("localhost", 1888)
+mqttc.connect("localhost", get_test_server_port())
 loop_until_keyboard_interrupt(mqttc)

tests/lib/clients/01-unpwd-unicode-set.py

@@ -1,12 +1,12 @@
 
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 mqttc = mqtt.Client("01-unpwd-unicode-set")
 
 username = "\u00fas\u00e9rn\u00e1m\u00e9-h\u00e9ll\u00f3"
 password = "h\u00e9ll\u00f3"
 mqttc.username_pw_set(username, password)
-mqttc.connect("localhost", 1888)
+mqttc.connect("localhost", get_test_server_port())
 loop_until_keyboard_interrupt(mqttc)

tests/lib/clients/01-will-set.py

@@ -1,9 +1,9 @@
 import paho.mqtt.client as mqtt
 
-from tests.paho_test import loop_until_keyboard_interrupt
+from tests.paho_test import get_test_server_port, loop_until_keyboard_interrupt
 
 mqttc = mqtt.Client("01-will-set")
 
 mqttc.will_set("topic/on/unexpected/disconnect", "will message", 1, True)
-mqttc.connect("localhost", 1888)
+mqttc.connect("localhost", get_test_server_port())
 loop_until_keyboard_interrupt(mqttc)