refactoring

This commit is contained in:
Stefan Allius
2024-09-24 21:12:51 +02:00
parent 89c2c11ed9
commit d5c369e5fe
23 changed files with 1257 additions and 942 deletions

View File

@@ -5,7 +5,7 @@ import aiomqtt
import logging
from mock import patch, Mock
from app.src.async_ifc import AsyncIfc
from app.src.async_stream import AsyncIfcImpl
from app.src.singleton import Singleton
from app.src.mqtt import Mqtt
from app.src.modbus import Modbus
@@ -45,8 +45,7 @@ def config_no_conn(test_port):
@pytest.fixture
def spy_at_cmd():
ifc = AsyncIfc()
conn = SolarmanV5(server_side=True, client_mode= False, ifc=ifc)
conn = SolarmanV5(server_side=True, client_mode= False, ifc=AsyncIfcImpl())
conn.node_id = 'inv_2/'
with patch.object(conn, 'send_at_cmd', wraps=conn.send_at_cmd) as wrapped_conn:
yield wrapped_conn
@@ -54,8 +53,7 @@ def spy_at_cmd():
@pytest.fixture
def spy_modbus_cmd():
ifc = AsyncIfc()
conn = SolarmanV5(server_side=True, client_mode= False, ifc=ifc)
conn = SolarmanV5(server_side=True, client_mode= False, ifc=AsyncIfcImpl())
conn.node_id = 'inv_1/'
with patch.object(conn, 'send_modbus_cmd', wraps=conn.send_modbus_cmd) as wrapped_conn:
yield wrapped_conn
@@ -63,8 +61,7 @@ def spy_modbus_cmd():
@pytest.fixture
def spy_modbus_cmd_client():
ifc = AsyncIfc()
conn = SolarmanV5(server_side=False, client_mode= False, ifc=ifc)
conn = SolarmanV5(server_side=False, client_mode= False, ifc=AsyncIfcImpl())
conn.node_id = 'inv_1/'
with patch.object(conn, 'send_modbus_cmd', wraps=conn.send_modbus_cmd) as wrapped_conn:
yield wrapped_conn