Skip to content

Commit

Permalink
Allow running tests in parallel (don't reuse addresses)
Browse files Browse the repository at this point in the history
  • Loading branch information
akx committed Dec 24, 2023
1 parent 9e0918b commit 63f1758
Show file tree
Hide file tree
Showing 54 changed files with 128 additions and 128 deletions.
4 changes: 3 additions & 1 deletion tests/lib/clients/01-asyncio.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

import paho.mqtt.client as mqtt

from tests.paho_test import get_test_server_port

client_id = 'asyncio-test'


Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/clients/01-decorators.py
Original file line number Diff line number Diff line change
@@ -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""
Expand Down Expand Up @@ -38,5 +38,5 @@ def on_disconnect(mqttc, obj, rc):
obj = rc


mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-keepalive-pingreq.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -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)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-no-clean-session.py
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-reconnect-on-failure.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -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
4 changes: 2 additions & 2 deletions tests/lib/clients/01-unpwd-empty-password-set.py
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-unpwd-empty-set.py
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-unpwd-set.py
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-unpwd-unicode-set.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,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)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-will-set.py
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-will-unpwd-set.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
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-unpwd-set")

mqttc.username_pw_set("oibvvwqw", "#'^2hg9a&nm38*us")
mqttc.will_set("will-topic", "will message", 2, False)
mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/01-zero-length-clientid.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -17,5 +17,5 @@ def on_disconnect(mqttc, obj, rc):
mqttc.on_connect = on_connect
mqttc.on_disconnect = on_disconnect

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/02-subscribe-qos0.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -21,5 +21,5 @@ def on_subscribe(mqttc, obj, mid, granted_qos):
mqttc.on_disconnect = on_disconnect
mqttc.on_subscribe = on_subscribe

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/02-subscribe-qos1.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -21,5 +21,5 @@ def on_subscribe(mqttc, obj, mid, granted_qos):
mqttc.on_disconnect = on_disconnect
mqttc.on_subscribe = on_subscribe

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/02-subscribe-qos2.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -21,5 +21,5 @@ def on_subscribe(mqttc, obj, mid, granted_qos):
mqttc.on_disconnect = on_disconnect
mqttc.on_subscribe = on_subscribe

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/02-unsubscribe.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -21,5 +21,5 @@ def on_unsubscribe(mqttc, obj, mid):
mqttc.on_disconnect = on_disconnect
mqttc.on_unsubscribe = on_unsubscribe

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-b2c-qos1.py
Original file line number Diff line number Diff line change
@@ -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

expected_payload = b"message"

Expand All @@ -21,5 +21,5 @@ def on_connect(mqttc, obj, flags, rc):
mqttc.on_connect = on_connect
mqttc.on_message = on_message

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-b2c-qos2.py
Original file line number Diff line number Diff line change
@@ -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

expected_payload = b"message"

Expand All @@ -21,7 +21,7 @@ def on_connect(mqttc, obj, flags, rc):
mqttc.on_connect = on_connect
mqttc.on_message = on_message

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())

with wait_for_keyboard_interrupt():
while True:
Expand Down
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-c2b-qos1-disconnect.py
Original file line number Diff line number Diff line change
@@ -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

sent_mid = -1

Expand Down Expand Up @@ -29,5 +29,5 @@ def on_publish(mqttc, obj, mid):
mqttc.on_disconnect = on_disconnect
mqttc.on_publish = on_publish

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-c2b-qos2-disconnect.py
Original file line number Diff line number Diff line change
@@ -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

first_connection = 1

Expand All @@ -27,5 +27,5 @@ def on_publish(mqttc, obj, mid):
mqttc.on_disconnect = on_disconnect
mqttc.on_publish = on_publish

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-helper-qos0-v5.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import paho.mqtt.client
import paho.mqtt.publish

from tests.paho_test import wait_for_keyboard_interrupt
from tests.paho_test import get_test_server_port, wait_for_keyboard_interrupt

with wait_for_keyboard_interrupt():
paho.mqtt.publish.single(
"pub/qos0/test",
"message",
qos=0,
hostname="localhost",
port=1888,
port=get_test_server_port(),
client_id="publish-helper-qos0-test",
protocol=paho.mqtt.client.MQTTv5,
)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-helper-qos0.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import paho.mqtt.publish

from tests.paho_test import wait_for_keyboard_interrupt
from tests.paho_test import get_test_server_port, wait_for_keyboard_interrupt

with wait_for_keyboard_interrupt():
paho.mqtt.publish.single(
"pub/qos0/test",
"message",
qos=0,
hostname="localhost",
port=1888,
port=get_test_server_port(),
client_id="publish-helper-qos0-test",
)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-helper-qos1-disconnect.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import paho.mqtt.publish

from tests.paho_test import wait_for_keyboard_interrupt
from tests.paho_test import get_test_server_port, wait_for_keyboard_interrupt

with wait_for_keyboard_interrupt():
paho.mqtt.publish.single(
"pub/qos1/test",
"message",
qos=1,
hostname="localhost",
port=1888,
port=get_test_server_port(),
client_id="publish-helper-qos1-disconnect-test",
)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-qos0-no-payload.py
Original file line number Diff line number Diff line change
@@ -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

sent_mid = -1

Expand All @@ -20,5 +20,5 @@ def on_publish(mqttc, obj, mid):
mqttc.on_connect = on_connect
mqttc.on_publish = on_publish

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/03-publish-qos0.py
Original file line number Diff line number Diff line change
@@ -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

sent_mid = -1

Expand All @@ -22,5 +22,5 @@ def on_publish(mqttc, obj, mid):
mqttc.on_connect = on_connect
mqttc.on_publish = on_publish

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/04-retain-qos0.py
Original file line number Diff line number Diff line change
@@ -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):
Expand All @@ -11,5 +11,5 @@ def on_connect(mqttc, obj, flags, rc):
mqttc = mqtt.Client("retain-qos0-test", clean_session=True)
mqttc.on_connect = on_connect

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
4 changes: 2 additions & 2 deletions tests/lib/clients/08-ssl-connect-cert-auth-pw.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

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):
Expand All @@ -24,5 +24,5 @@ def on_disconnect(mqttc, obj, rc):
mqttc.on_connect = on_connect
mqttc.on_disconnect = on_disconnect

mqttc.connect("localhost", 1888)
mqttc.connect("localhost", get_test_server_port())
loop_until_keyboard_interrupt(mqttc)
Loading

0 comments on commit 63f1758

Please sign in to comment.