Convert test/ tests to Py.test

Signed-off-by: Aarni Koskela <akx@iki.fi>
eclipse · Dec 23, 2023 · e889845 · e889845
1 parent c88511a
commit e889845
Show file tree

Hide file tree

Showing 107 changed files with 445 additions and 993 deletions.
diff --git a/.gitignore b/.gitignore
@@ -45,9 +45,9 @@ nosetests.xml
 coverage.xml
 *,cover
 .hypothesis/
-test/ssl/demoCA
-test/ssl/rootCA
-test/ssl/signingCA
+tests/ssl/demoCA
+tests/ssl/rootCA
+tests/ssl/signingCA
 *.csr
 
 # Translations

diff --git a/conftest.py b/conftest.py
@@ -0,0 +1,2 @@
+# This file ensures py.test keeps this directory in sys.path,
+# so you can run `py.test tests/lib`.
diff --git a/test/Makefile b/test/Makefile
diff --git a/test/lib/01-unpwd-set.py b/test/lib/01-unpwd-set.py
diff --git a/test/lib/01-unpwd-unicode-set.py b/test/lib/01-unpwd-unicode-set.py
diff --git a/test/lib/01-will-unpwd-set.py b/test/lib/01-will-unpwd-set.py
diff --git a/test/lib/08-ssl-bad-cacert.py b/test/lib/08-ssl-bad-cacert.py
diff --git a/test/lib/08-ssl-fake-cacert.py b/test/lib/08-ssl-fake-cacert.py
diff --git a/test/lib/Makefile b/test/lib/Makefile
diff --git a/test/lib/context.py b/test/lib/context.py
diff --git a/test/ssl/demoCA/serial b/test/ssl/demoCA/serial
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/consts.py b/tests/consts.py
@@ -0,0 +1,4 @@
+import pathlib
+
+tests_path = pathlib.Path(__file__).parent
+ssl_path = tests_path / "ssl"
diff --git a/tests/lib/__init__.py b/tests/lib/__init__.py
diff --git a/test/lib/python/01-asyncio.test → tests/lib/clients/01-asyncio.py b/test/lib/python/01-asyncio.test → tests/lib/clients/01-asyncio.py
@@ -1,15 +1,11 @@
-#!/usr/bin/env python3
-
 import asyncio
 import socket
-import uuid
-
-import context  # Ensures paho is in PYTHONPATH
 
 import paho.mqtt.client as mqtt
 
 client_id = 'asyncio-test'
 
+
 class AsyncioHelper:
     def __init__(self, loop, client):
         self.loop = loop
@@ -91,6 +87,7 @@ async def main(self):
         await self.disconnected
         rc = 0
 
+
 rc = 1
 loop = asyncio.get_event_loop()
 loop.run_until_complete(AsyncMqttExample(loop).main())

diff --git a/test/lib/python/01-decorators.test → tests/lib/clients/01-decorators.py b/test/lib/python/01-decorators.test → tests/lib/clients/01-decorators.py
@@ -1,44 +1,42 @@
-#!/usr/bin/env python3
-
-import os
-import socket
-import subprocess
-import sys
-import time
-from struct import *
-
 import paho.mqtt.client as mqtt
 
 run = -1
 mqttc = mqtt.Client("decorators-test", run)
 payload = b""
 
+
 @mqttc.connect_callback()
 def on_connect(mqttc, obj, flags, rc):
     mqttc.subscribe("sub-test", 1)
 
+
 @mqttc.subscribe_callback()
 def on_subscribe(mqttc, obj, mid, granted_qos):
     mqttc.unsubscribe("unsub-test")
 
+
 @mqttc.unsubscribe_callback()
 def on_unsubscribe(mqttc, obj, mid):
     global payload
     payload = "message"
 
+
 @mqttc.message_callback()
 def on_message(mqttc, obj, msg):
     global payload
     mqttc.publish("decorators", qos=1, payload=payload)
 
+
 @mqttc.publish_callback()
 def on_publish(mqttc, obj, mid):
     mqttc.disconnect()
 
+
 @mqttc.disconnect_callback()
 def on_disconnect(mqttc, obj, rc):
     obj = rc
 
+
 mqttc.connect("localhost", 1888)
 while run == -1:
     mqttc.loop()

diff --git a/test/lib/python/01-keepalive-pingreq.test → tests/lib/clients/01-keepalive-pingreq.py b/test/lib/python/01-keepalive-pingreq.test → tests/lib/clients/01-keepalive-pingreq.py
@@ -1,19 +1,11 @@
-#!/usr/bin/env python3
-
-import os
-import socket
-import subprocess
-import sys
-import time
-from struct import *
-
 import paho.mqtt.client as mqtt
 
 
 def on_connect(mqttc, obj, flags, rc):
     if rc != 0:
         exit(rc)
 
+
 run = -1
 mqttc = mqtt.Client("01-keepalive-pingreq")
 mqttc.on_connect = on_connect

diff --git a/test/lib/python/01-no-clean-session.test → tests/lib/clients/01-no-clean-session.py b/test/lib/python/01-no-clean-session.test → tests/lib/clients/01-no-clean-session.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 import paho.mqtt.client as mqtt
 
 mqttc = mqtt.Client("01-no-clean-session", False)