test: add more testing

juergenH87 · Jun 14, 2024 · 15dc13e · 15dc13e
1 parent 4a5dfea
commit 15dc13e
Showing 1 changed file with 27 additions and 5 deletions.
diff --git a/test/test_memory_access.py b/test/test_memory_access.py
@@ -126,19 +126,29 @@
 ]
 
 read_with_seed_error = [
-    (Feeder.MsgType.CANTX, 0x18D9D4F9, [0x01, 0x13, 0x03, 0x00, 0x00, 0x92, 0x07, 0x00], 0.0),  # DM14 read address 0x91000007
+    (Feeder.MsgType.CANTX, 0x18D9D4F9, [0x01, 0x13, 0x03, 0x00, 0x00, 0x92, 0x07, 0x00], 0.0),  # DM14 read address 0x92000007
     (Feeder.MsgType.CANRX, 0x18D8F9D4, [0x00, 0x11, 0xFF, 0xFF, 0xFF, 0xFF, 0x5A, 0xA5], 0.0),  # DM15 seed response
     (Feeder.MsgType.CANTX, 0x18D9D4F9, [0x01, 0x13, 0x03, 0x00, 0x00, 0x92, 0xA5, 0x5A], 0.0),  # DM14 key response
     (Feeder.MsgType.CANRX, 0x18D8F9D4, [0x00, 0x1B, 0x01, 0x00, 0x00, 0x07, 0xFF, 0xFF], 0.0),  # DM15 error response
 ]
 
+read_no_seed_error = [
+    (Feeder.MsgType.CANTX, 0x18D9D4F9, [0x01, 0x13, 0x03, 0x00, 0x00, 0x92, 0x07, 0x00], 0.0),  # DM14 read address 0x92000007
+    (Feeder.MsgType.CANRX, 0x18D8F9D4, [0x00, 0x1B, 0x01, 0x00, 0x00, 0x07, 0xFF, 0xFF], 0.0),  # DM15 error response
+]
+
 write_with_seed_error = [
     (Feeder.MsgType.CANTX, 0x18D9D4F9, [0x01, 0x15, 0x07, 0x00, 0x00, 0x91, 0x07, 0x00], 0.0),  # DM14 write address 0x91000007
     (Feeder.MsgType.CANRX, 0x18D8F9D4, [0x00, 0x11, 0xFF, 0xFF, 0xFF, 0xFF, 0x5A, 0xA5], 0.0),  # DM15 seed response
     (Feeder.MsgType.CANTX, 0x18D9D4F9, [0x01, 0x15, 0x07, 0x00, 0x00, 0x91, 0xA5, 0x5A], 0.0),  # DM14 key response
     (Feeder.MsgType.CANRX, 0x18D8F9D4, [0x00, 0x1B, 0x01, 0x00, 0x00, 0x07, 0xFF, 0xFF], 0.0),  # DM15 error response
 ]
 
+write_no_seed_error = [
+    (Feeder.MsgType.CANTX, 0x18D9D4F9, [0x01, 0x15, 0x07, 0x00, 0x00, 0x91, 0x07, 0x00], 0.0),  # DM14 write address 0x91000007
+    (Feeder.MsgType.CANRX, 0x18D8F9D4, [0x00, 0x1B, 0x01, 0x00, 0x00, 0x07, 0xFF, 0xFF], 0.0),  # DM15 error response
+]
+
 error_codes = [0x10, 0x11, 0x12, 0x100, 0x101, 0x1000, 0x1001, 0x100F, 0x10FE]
 # fmt: on
 
@@ -668,13 +678,19 @@ def test_dm14_write_error(feeder, error_code):
     feeder.process_messages()
 
 
-def test_dm14_read_error_response(feeder):
+@pytest.mark.parametrize(
+    argnames=["expected_messages"],
+    argvalues=[[read_with_seed_error], [read_no_seed_error]],
+    ids=["With seed key", "Without seed key"],
+)
+def test_dm14_read_error_response(feeder, expected_messages):
     """
     Tests that the DM14 read query can react to errors correctly
     :param feeder: can message feeder
+    :param expected_messages: list of expected messages
     """
     with pytest.raises(RuntimeError) as excinfo:
-        feeder.can_messages = read_with_seed_error
+        feeder.can_messages = expected_messages
         feeder.pdus_from_messages()
         ca = feeder.accept_all_messages(
             device_address_preferred=0xF9, bypass_address_claim=True
@@ -688,13 +704,19 @@ def test_dm14_read_error_response(feeder):
     feeder.process_messages()
 
 
-def test_dm14_write_error_response(feeder):
+@pytest.mark.parametrize(
+    argnames=["expected_messages"],
+    argvalues=[[write_with_seed_error], [write_no_seed_error]],
+    ids=["With seed key", "Without seed key"],
+)
+def test_dm14_write_error_response(feeder, expected_messages):
     """
     Tests that the DM14 read query can react to errors correctly
     :param feeder: can message feeder
+    :param expected_messages: list of expected messages
     """
     with pytest.raises(RuntimeError) as excinfo:
-        feeder.can_messages = write_with_seed_error
+        feeder.can_messages = expected_messages
         feeder.pdus_from_messages()
         ca = feeder.accept_all_messages(
             device_address_preferred=0xF9, bypass_address_claim=True