diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index c5ec58e8e..6a867c99c 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -148,11 +148,11 @@ jobs: - name: function test run: | if [ "${{ matrix.plugin }}" = "core" ]; then - pytest -s -v tests/ft --ignore=tests/ft/test_modbus.py --ignore=tests/ft/test_metrics.py + pytest -s -v tests/ft --ignore=tests/ft/driver/test_modbus.py --ignore=tests/ft/metrics/test_metrics.py elif [ "${{ matrix.plugin }}" = "modbus" ]; then - pytest -s -v tests/ft/driver/"test_modbus.py" + pytest -s -v tests/ft/driver/test_modbus.py else - pytest -s -v tests/ft/metrics/"test_metrics.py" + pytest -s -v tests/ft/metrics/test_metrics.py fi - name: create cov report diff --git a/tests/ft/http_api/test_http_api.py b/tests/ft/http_api/test_http_api.py index dbb68f443..995d9c2a9 100644 --- a/tests/ft/http_api/test_http_api.py +++ b/tests/ft/http_api/test_http_api.py @@ -121,7 +121,7 @@ def test_get_global_config(self): assert len(config_data['settings']) == 2 assert config_data['settings'][0]['node'] == 'mqtt' - response = api.del_node_check(node='mqtt') + response = api.del_node_check(node='modbus') response = api.get_global_config() assert 200 == response.status_code @@ -130,20 +130,17 @@ def test_get_global_config(self): assert 'nodes' in config_data assert len(config_data['nodes']) == 1 - assert config_data['nodes'][0]['plugin'] == 'Modbus TCP' + assert config_data['nodes'][0]['plugin'] == 'MQTT' assert 'groups' in config_data - assert len(config_data['groups']) == 1 - assert config_data['groups'][0]['driver'] == 'modbus' + assert len(config_data['groups']) == 0 assert 'tags' in config_data - assert len(config_data['tags']) == 1 - assert config_data['tags'][0]['driver'] == 'modbus' - assert len(config_data['tags'][0]['tags']) == 1 + assert len(config_data['tags']) == 0 assert 'subscriptions' in config_data assert len(config_data['subscriptions']) == 0 assert 'settings' in config_data assert len(config_data['settings']) == 1 - assert config_data['settings'][0]['node'] == 'modbus' \ No newline at end of file + assert config_data['settings'][0]['node'] == 'mqtt' \ No newline at end of file