diff --git a/tests/ft/app/test_mqtt.py b/tests/ft/app/test_mqtt.py index 651afdef..897ab872 100644 --- a/tests/ft/app/test_mqtt.py +++ b/tests/ft/app/test_mqtt.py @@ -1,4 +1,3 @@ -from base64 import b64encode import time import pytest @@ -97,11 +96,6 @@ def mocker(): mock.done() -def base64(file): - with open(file, "rb") as f: - return b64encode(f.read()).decode("utf-8") - - @pytest.fixture(scope="function") def conf_base(mocker): return { @@ -140,7 +134,7 @@ def conf_ssl1(conf_base, mocker): **conf_base, "port": mocker.ssl_port, "ssl": True, - "ca": base64(mocker.ca), + "ca": mocker.ca_base64, } @@ -148,8 +142,8 @@ def conf_ssl1(conf_base, mocker): def conf_ssl2(conf_ssl1, mocker): return { **conf_ssl1, - "cert": base64(mocker.client_cert), - "key": base64(mocker.client_key), + "cert": mocker.client_cert_base64, + "key": mocker.client_key_base64, } @@ -161,9 +155,9 @@ def conf_user_ssl(conf_base, mocker): "password": mocker.password, "port": mocker.ssl_port, "ssl": True, - "ca": base64(mocker.ca), - "cert": base64(mocker.client_cert), - "key": base64(mocker.client_key), + "ca": mocker.ca_base64, + "cert": mocker.client_cert_base64, + "key": mocker.client_key_base64, } @@ -254,7 +248,7 @@ def conf_ssl_bad_cert(conf_ssl1): def conf_ssl_no_key(conf_ssl1, mocker): return { **conf_ssl1, - "cert": base64(mocker.client_cert), + "cert": mocker.client_cert_base64 } diff --git a/tests/ft/neuron/data/__init__.py b/tests/ft/neuron/data/__init__.py new file mode 100644 index 00000000..582d2677 --- /dev/null +++ b/tests/ft/neuron/data/__init__.py @@ -0,0 +1,20 @@ +from base64 import b64encode +import pathlib + + +def base64(file): + with open(file, "rb") as f: + return b64encode(f.read()).decode("utf-8") + + +data_dir = pathlib.Path(__file__).resolve().parent +ca = str(data_dir / "ca.pem") +ca_base64 = base64(ca) +server_cert = str(data_dir / "server.pem") +server_cert_base64 = base64(server_cert) +server_key = str(data_dir / "server.key") +server_key_base64 = base64(server_key) +client_cert = str(data_dir / "client.pem") +client_cert_base64 = base64(client_cert) +client_key = str(data_dir / "client.key") +client_key_base64 = base64(client_key) diff --git a/tests/ft/neuron/mqtt/ca.pem b/tests/ft/neuron/data/ca.pem similarity index 100% rename from tests/ft/neuron/mqtt/ca.pem rename to tests/ft/neuron/data/ca.pem diff --git a/tests/ft/neuron/mqtt/client.key b/tests/ft/neuron/data/client.key similarity index 100% rename from tests/ft/neuron/mqtt/client.key rename to tests/ft/neuron/data/client.key diff --git a/tests/ft/neuron/mqtt/client.pem b/tests/ft/neuron/data/client.pem similarity index 100% rename from tests/ft/neuron/mqtt/client.pem rename to tests/ft/neuron/data/client.pem diff --git a/tests/ft/neuron/mqtt/broker.key b/tests/ft/neuron/data/server.key similarity index 100% rename from tests/ft/neuron/mqtt/broker.key rename to tests/ft/neuron/data/server.key diff --git a/tests/ft/neuron/mqtt/broker.pem b/tests/ft/neuron/data/server.pem similarity index 100% rename from tests/ft/neuron/mqtt/broker.pem rename to tests/ft/neuron/data/server.pem diff --git a/tests/ft/neuron/mqtt/__init__.py b/tests/ft/neuron/mqtt/__init__.py index 5867f882..89596915 100644 --- a/tests/ft/neuron/mqtt/__init__.py +++ b/tests/ft/neuron/mqtt/__init__.py @@ -4,6 +4,7 @@ import random import string import time +from neuron import data from neuron.mqtt.client import Client from neuron.mqtt.broker import Broker @@ -23,12 +24,16 @@ class Mock: self.user = user self.password = password - data_dir = pathlib.Path(__file__).resolve().parent - self.ca = str(data_dir / "ca.pem") - self.broker_cert = str(data_dir / "broker.pem") - self.broker_key = str(data_dir / "broker.key") - self.client_cert = str(data_dir / "client.pem") - self.client_key = str(data_dir / "client.key") + self.ca = data.ca + self.ca_base64 = data.ca_base64 + self.broker_cert = data.server_cert + self.broker_cert_base64 = data.server_cert_base64 + self.broker_key = data.server_key + self.broker_key_base64 = data.server_key_base64 + self.client_cert = data.client_cert + self.client_cert_base64 = data.client_cert_base64 + self.client_key = data.client_key + self.client_key_base64 = data.client_key_base64 self.broker = Broker( port=port, diff --git a/tests/ft/setup.py b/tests/ft/setup.py index 92049884..f4995c2e 100644 --- a/tests/ft/setup.py +++ b/tests/ft/setup.py @@ -10,5 +10,5 @@ setup( author="Neuron Team", author_email="neuron@emqx.io", packages=packages, - package_data={"neuron.mqtt": ["*.key", "*.pem"]}, + package_data={"neuron.data": ["*.key", "*.pem"]}, )