Skip to content

Commit 8a1592b

Browse files
committed
formatting
1 parent e753aff commit 8a1592b

File tree

2 files changed

+20
-10
lines changed

2 files changed

+20
-10
lines changed

tedge_modbus/reader/mapper.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,11 @@ def check_alarm(self, value, alarm_mapping, register_type, register_key):
220220
topic = topics["alarm"]
221221
topic = topic.replace("CHILD_ID", self.device.get("name"))
222222
topic = topic.replace("TYPE", alarm_type)
223-
data = {"text": text, "severity": severity, "time": datetime.now(timezone.utc).isoformat()}
223+
data = {
224+
"text": text,
225+
"severity": severity,
226+
"time": datetime.now(timezone.utc).isoformat(),
227+
}
224228
messages.append(MappedMessage(json.dumps(data), topic))
225229
return messages
226230

tests/unit/test_mapper.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ def test_on_change_true_and_value_is_same(self):
6868
messages, _ = self.mapper.map_register(
6969
read_register=[123], register_def=register_def
7070
)
71-
self.assertEqual(
72-
len(messages), 0, "Should not publish when value is unchanged"
73-
)
71+
self.assertEqual(len(messages), 0, "Should not publish when value is unchanged")
7472

7573
def test_on_change_false_and_value_is_same(self):
7674
register_def = {
@@ -198,7 +196,9 @@ def test_separate_measurements(self):
198196
self.mapper.map_register(read_register=[0], register_def=register_def)
199197
# Second poll: Check if Measurements get separated
200198
messages, measurement3 = self.mapper.map_register(
201-
read_register=[1], register_def=register_def, device_combine_measurements=True
199+
read_register=[1],
200+
register_def=register_def,
201+
device_combine_measurements=True,
202202
)
203203
topics = [message.topic for message in messages]
204204
self.assertTrue("te/device/test_device///m/" not in topics)
@@ -236,13 +236,19 @@ def test_combine_messages(self):
236236
}
237237

238238
_, measurement1 = self.mapper.map_register(
239-
read_register=[25], register_def=register_def1, device_combine_measurements=True
239+
read_register=[25],
240+
register_def=register_def1,
241+
device_combine_measurements=True,
240242
)
241243
_, measurement2 = self.mapper.map_register(
242-
read_register=[43], register_def=register_def2, device_combine_measurements=True
244+
read_register=[43],
245+
register_def=register_def2,
246+
device_combine_measurements=True,
243247
)
244248
_, measurement3 = self.mapper.map_register(
245-
read_register=[21], register_def=register_def3, device_combine_measurements=True
249+
read_register=[21],
250+
register_def=register_def3,
251+
device_combine_measurements=True,
246252
)
247253

248254
measurement1.extend_data(measurement2)
@@ -295,7 +301,7 @@ def test_alarm_mapping(self):
295301
alarm_data2 = json.loads(messages2[0].data)
296302
self.assertEqual(alarm_data2["severity"], "major")
297303
self.assertEqual(alarm_data2["text"], "This alarm tests the alarm mapping")
298-
304+
299305
def test_event_mapping(self):
300306
register_def = {
301307
"number": 100,
@@ -333,4 +339,4 @@ def test_event_mapping(self):
333339
self.assertTrue("te/device/test_device///e/" in topics2)
334340
self.assertEqual(len(messages2), 1)
335341
event_data2 = json.loads(messages2[0].data)
336-
self.assertEqual(event_data2["text"], "This event tests the event mapping")
342+
self.assertEqual(event_data2["text"], "This event tests the event mapping")

0 commit comments

Comments
 (0)