test_packet.py: test randomly generated headers

Also includes some fixes for the non-last_be test path such that the
expected behavior is the one currently oberserved with the Packetizer
and Depacketizer.

test/test_packet.py

@@ -26,18 +26,28 @@ def mask_last_be(dw, data, last_be):
 
 class TestPacket(unittest.TestCase):
     def loopback_test(self, dw, seed=42, with_last_be=False, debug_print=False):
-        packet_header_length = 31
+        # Independent random number generator to ensure we're the
-        packet_header_fields = {
+        # stream_inserter and stream_collectors still have
-            "field_8b"  : HeaderField(0,  0,   8),
+        # reproducible behavior independent of the headers
-            "field_16b" : HeaderField(1,  0,  16),
+        prng = random.Random(seed + 5)
-            "field_32b" : HeaderField(3,  0,  32),
+
-            "field_64b" : HeaderField(7,  0,  64),
+        # Generate a random number of differently sized header fields
-            "field_128b": HeaderField(15, 0, 128),
+        nheader_fields = prng.randrange(16)
-        }
+        i = 0
+        packet_header_length = 0
+        packet_header_fields = {}
+        while packet_header_length < dw // 8 or i < nheader_fields:
+            # Header field size can be 1, 2, 4, 8, 16 bytes
+            field_length = 2**prng.randrange(5)
+            packet_header_fields["field{}_{}b".format(i, field_length * 8)] = \
+                HeaderField(packet_header_length, 0, field_length * 8)
+            packet_header_length += field_length
+            i += 1
+
         packet_header = Header(
             fields           = packet_header_fields,
             length           = packet_header_length,
-            swap_field_bytes = True)
+            swap_field_bytes = bool(prng.getrandbits(1)))
 
         def packet_description(dw):
             param_layout = packet_header.get_layout()
@@ -56,17 +66,13 @@ class TestPacket(unittest.TestCase):
 
             return EndpointDescription(payload_layout)
 
-        prng = random.Random(seed)
         # Prepare packets
-        npackets = 64
+        npackets = 32
         packets  = []
         for n in range(npackets):
             header               = {}
-            header["field_8b"]   = prng.randrange(2**8)
+            for name, headerfield in packet_header_fields.items():
-            header["field_16b"]  = prng.randrange(2**16)
+                header[name] = prng.randrange(2**headerfield.width)
-            header["field_32b"]  = prng.randrange(2**32)
-            header["field_64b"]  = prng.randrange(2**64)
-            header["field_128b"] = prng.randrange(2**128)
             datas = [prng.randrange(2**8) for _ in range(prng.randrange(dw - 1) + 1)]
             packets.append(StreamPacket(datas, header))
 
@@ -108,39 +114,75 @@ class TestPacket(unittest.TestCase):
             ],
         )
 
-        # When we don't have a last_be signal, the Packetizer will
+        # When we don't have a last_be signal, the Packetizer will simply throw
-        # simply throw away the partial bus word. The Depacketizer
+        # away the partial bus word. The Depacketizer will then fill up these
-        # will then fill up these values with garbage again. Thus we
+        # values with garbage again. Thus we also have to remove the proper
-        # also have to remove the proper amount of bytes from the sent
+        # amount of bytes from the sent packets so the comparson will work.
-        # packets so the comparison will work.
         if not with_last_be and dw != 8:
+            # Modulo operation which returns the divisor instead of zero.
+            def upmod(a, b):
+                return b if a % b == 0 else a % b
+
             for (packet, recvd_packet) in zip(packets, recvd_packets):
-                invalid_recvd_bytes = packet_header_length % (dw // 8)
+                # How many bytes of the header have to be interleaved with the
-                recvd_packet.data = recvd_packet.data[:-invalid_recvd_bytes]
+                # first data word on the bus.
+                header_leftover = packet_header_length % (dw // 8)
+
+                # If the last word of our data would fit together with the
+                # header_leftover bytes in a single bus word, all data (plus
+                # some trailing garbage) will arrive. Otherwise, some data bytes
+                # will be missing.
+                if header_leftover != 0 and \
+                   header_leftover + upmod(len(packet.data), dw // 8) <= (dw // 8):
+                    # The entire data will arrive, plus some trailing
+                    # garbage. Remove that.
+                    garbage_bytes = -len(packet.data) % (dw // 8)
+                    recvd_packet.data = recvd_packet.data[:-garbage_bytes]
+                else:
+                    # header_leftover bytes in received data have been replaced
+                    # with garbage. Remove these bytes from the received and
+                    # sent data.
+                    recvd_packet.data = recvd_packet.data[:-header_leftover]
                     packet.data = packet.data[:len(recvd_packet.data)]
 
         self.assertTrue(compare_packets(packets, recvd_packets))
 
     def test_8bit_loopback(self):
-        self.loopback_test(dw=8)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=8, seed=seed)
 
     def test_8bit_loopback_last_be(self):
-        self.loopback_test(dw=8, with_last_be=True)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=8, seed=seed, with_last_be=True)
 
     def test_32bit_loopback(self):
-        self.loopback_test(dw=32)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=32, seed=seed)
 
     def test_32bit_loopback_last_be(self):
-        self.loopback_test(dw=32, with_last_be=True)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=32, seed=seed, with_last_be=True)
 
     def test_64bit_loopback(self):
-        self.loopback_test(dw=64)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=64, seed=seed)
 
     def test_64bit_loopback_last_be(self):
-        self.loopback_test(dw=64, with_last_be=True)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=64, seed=seed, with_last_be=True)
 
     def test_128bit_loopback(self):
-        self.loopback_test(dw=128)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=128, seed=seed)
 
     def test_128bit_loopback_last_be(self):
-        self.loopback_test(dw=128, with_last_be=True)
+        for seed in range(42, 48):
+            with self.subTest(seed=seed):
+                self.loopback_test(dw=128, seed=seed, with_last_be=True)