modify test for address at end

ebpfcat/ethercat_test.py

@@ -46,7 +46,10 @@ class MockEtherCat:
         return self.results.pop(0)
 
     def send_packet(self, data):
-        self.test.assertEqual(data, self.expected.pop(0), data.hex())
+        expected = self.expected.pop(0)
+        if len(expected) < 46:
+            expected += b"\0" * (46 - len(expected))
+        self.test.assertEqual(data, expected, data.hex())
 
     async def receive_index(self, index):
         self.test.assertEqual(index, self.expected.pop(0))
@@ -54,7 +57,10 @@ class MockEtherCat:
             self.test.future.cancel()
             for i in range(10):
                 await sleep(0)
-        return self.results.pop(0)
+        expected = self.results.pop(0)
+        if len(expected) < 46:
+            expected += b"\0" * (46 - len(expected))
+        return expected
 
     def register_sync_group(self, sg, packet):
         self.rsg = sg
@@ -127,26 +133,26 @@ class Tests(TestCase):
         sg = SyncGroup(ec, [ai])
         self.task = sg.start()
         ec.expected = [
-            H("2a10"  # EtherCAT Header, length & type
-              "0000e8030000008000000000"  # ID datagram
+            H("2810"  # EtherCAT Header, length & type
               # in datagram
-              "04000400801110000000000000000000000000000000000000000000"),
+              "04000400801110800000000000000000000000000000000000000000"
+              "0000e8030000000000000000"),  # ID datagram
             1000, # == 0x3e8, see ID datagram
-            H("2a10"  # EtherCAT Header, length & type
-              "0000e8030000008000000000"  # ID datagram
+            H("2810"  # EtherCAT Header, length & type
               # in datagram
-              "04000400801110000000123456780000000000000000000000000000"),
+              "04000400801110800000123456780000000000000000000000000000"
+              "0000e8030000000000000000"),  # ID datagram
             1000,
             ]
         ec.results = [
-            H("2a10"  # EtherCAT Header, length & type
-              "0000e8030000008000000000"  # ID datagram
+            H("2810"  # EtherCAT Header, length & type
+              "04000400801110800000123456780000000000000000000000000000"
+              "0000e8030000000000000000"),  # ID datagram
               # in datagram
-              "04000400801110000000123456780000000000000000000000000000"),
-            H("2a10"  # EtherCAT Header, length & type
-              "0000e8030000008000000000"  # ID datagram
+            H("2810"  # EtherCAT Header, length & type
               # in datagram
-              "04000400801110000000123456780000000000000000000000000000"),
+              "04000400801110800000123456780000000000000000000000000000"),
+              "0000e8030000000000000000"  # ID datagram
             ]
         self.future = Future()
         with self.assertRaises(CancelledError):
@@ -173,9 +179,9 @@ class Tests(TestCase):
         sg = SyncGroup(ec, [ao])
         self.task = sg.start()
         ec.expected = [
-            H("2210"  # EtherCAT Header, length & type
-              "0000e8030000008000000000"  # ID datagram
-              "0500070000110800000000000000000000000000"), # out datagram
+            H("2010"  # EtherCAT Header, length & type
+              "0500070000110880000000000000000000000000" # out datagram
+              "0000e8030000000000000000"),  # ID datagram
             1000, # == 0x3e8, see ID datagram
             ]
         ec.results = [
@@ -186,15 +192,15 @@ class Tests(TestCase):
         with self.assertRaises(CancelledError):
             await gather(self.future, self.task)
         ec.expected = [
-            H("2210"  # EtherCAT Header, length & type
-              "0000e8030000008000000000"  # ID datagram
-              "0500070000110800000076980000000000000000"), # out datagram
+            H("2010"  # EtherCAT Header, length & type
+              "0500070000110880000076980000000000000000" # out datagram
+              "0000e8030000000000000000"),  # ID datagram
             1000,
             ]
         ec.results = [
-            H("2210"  # EtherCAT Header, length & type
-              "0000e8030000008000000000"  # ID datagram
-              "0500070000110800000076980000000000000000"), # out datagram
+            H("2010"  # EtherCAT Header, length & type
+              "0500070000110880000076980000000000000000" # out datagram
+              "0000e8030000000000000000"), # ID datagram
             ]
         self.future = Future()
         with self.assertRaises(CancelledError):