From 6dbdcd1defdb154cd05ed7f631fda7fde0bb314d Mon Sep 17 00:00:00 2001 From: Andreas Lemke Date: Sat, 29 Jul 2023 22:49:14 +0200 Subject: [PATCH] flake issues resolved --- packages/modules/devices/json/config.py | 4 +++- packages/modules/devices/json/counter.py | 2 +- packages/modules/devices/json/device.py | 2 +- packages/modules/devices/json/device_test.py | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/modules/devices/json/config.py b/packages/modules/devices/json/config.py index bbc0fea8da..2c516805f6 100644 --- a/packages/modules/devices/json/config.py +++ b/packages/modules/devices/json/config.py @@ -42,7 +42,9 @@ def __init__(self, class JsonCounterConfiguration: def __init__(self, jq_power: str = "", jq_exported: Optional[str] = None, jq_imported: Optional[str] = None, - jq_power_l1: Optional[str] = None, jq_power_l2: Optional[str] = None, jq_power_l3: Optional[str] = None): + jq_power_l1: Optional[str] = None, + jq_power_l2: Optional[str] = None, + jq_power_l3: Optional[str] = None): self.jq_power = jq_power self.jq_exported = jq_exported self.jq_imported = jq_imported diff --git a/packages/modules/devices/json/counter.py b/packages/modules/devices/json/counter.py index 6c36a76513..b254ede348 100644 --- a/packages/modules/devices/json/counter.py +++ b/packages/modules/devices/json/counter.py @@ -32,7 +32,7 @@ def update(self, response): float(jq.compile(config.jq_power_l2).input(response).first()), float(jq.compile(config.jq_power_l3).input(response).first()) ] - + if config.jq_imported is None or config.jq_exported is None: imported, exported = self.sim_counter.sim_count(power) else: diff --git a/packages/modules/devices/json/device.py b/packages/modules/devices/json/device.py index 103076c356..810c793a57 100644 --- a/packages/modules/devices/json/device.py +++ b/packages/modules/devices/json/device.py @@ -56,7 +56,7 @@ def read_legacy_bat(ip_address: str, jq_power: str, jq_soc: str): read_legacy(ip_address, bat.component_descriptor.configuration_factory(id=None, configuration=config)) -def read_legacy_counter(ip_address: str, jq_power: str, jq_imported: str, jq_exported: str, +def read_legacy_counter(ip_address: str, jq_power: str, jq_imported: str, jq_exported: str, jq_power_l1: str, jq_power_l2: str, jq_power_l3: str): config = JsonCounterConfiguration(jq_power=jq_power, jq_imported=None if jq_imported == "" else jq_imported, diff --git a/packages/modules/devices/json/device_test.py b/packages/modules/devices/json/device_test.py index 68b72d19b0..9c9c51e496 100644 --- a/packages/modules/devices/json/device_test.py +++ b/packages/modules/devices/json/device_test.py @@ -45,7 +45,8 @@ def test_device(monkeypatch, mock_value_store: Mock, requests_mock: requests_moc def test_counter_powers(monkeypatch, mock_value_store: Mock, requests_mock: requests_mock.Mocker): # setup monkeypatch.setattr(FaultState, "store_error", Mock()) - requests_mock.get("http://sample_host/sample_path", json={"power": 42, "power_l1": 11, "power_l2": 12, "power_l3": 13}) + requests_mock.get("http://sample_host/sample_path", + json={"power": 42, "power_l1": 11, "power_l2": 12, "power_l3": 13}) device_config = Json(configuration=JsonConfiguration("http://sample_host/sample_path")) # execution