sv/tsun-gen3-proxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge conflict

Browse Source
This commit is contained in:
Stefan Allius
2024-09-03 18:54:49 +02:00
parent 7b4fabdc25
commit 270732f1d0
1 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/tests/test_modbus_tcp.py
View File

@@ -81,48 +81,8 @@ class TestType(Enum):
test = TestType.RD_TEST_0_BYTES test = TestType.RD_TEST_0_BYTES
def config_conn(test_hostname, test_port):
Config.act_config = {
'mqtt':{
'host': test_hostname,
'port': test_port,
'user': '',
'passwd': ''
},
'ha':{
'auto_conf_prefix': 'homeassistant',
'discovery_prefix': 'homeassistant',
'entity_prefix': 'tsun',
'proxy_node_id': 'test_1',
'proxy_unique_id': ''
},
'inverters':{
'allow_all': True,
"R170000000000001":{
'node_id': 'inv_1'
},
"Y170000000000001":{
'node_id': 'inv_2',
'monitor_sn': 2000000000,
'modbus_polling': True,
'suggested_area': "",
'sensor_list': 0x2b0,
'client_mode':{
'host': '192.168.0.1',
'port': 8899
}
}
}
}
class TestType(Enum):
RD_TEST_0_BYTES = 1
RD_TEST_TIMEOUT = 2
test = TestType.RD_TEST_0_BYTES
class FakeReader(): class FakeReader():
def __init__(self): def __init__(self):
self.on_recv = asyncio.Event() self.on_recv = asyncio.Event()
@@ -161,9 +121,6 @@ def patch_open():
def new_open(host: str, port: int): def new_open(host: str, port: int):
global test global test
if test == TestType.RD_TEST_TIMEOUT:
raise TimeoutError
global test
if test == TestType.RD_TEST_TIMEOUT: if test == TestType.RD_TEST_TIMEOUT:
raise TimeoutError raise TimeoutError
return new_conn(None) return new_conn(None)