test-network: add workaround for bug in iproute2 v6.2.0

Closes #27473.

(cherry picked from commit 8e2449a)
(cherry picked from commit 8813826)
(cherry picked from commit a4bef2a)

Author: yuwata

test/test-network/systemd-networkd-tests.py

@@ -3427,19 +3427,24 @@ def test_qdisc(self):
 
         output = check_output('tc -d class show dev dummy98')
         print(output)
-        self.assertRegex(output, 'class htb 2:30 root leaf 30:')
-        self.assertRegex(output, 'class htb 2:31 root leaf 31:')
-        self.assertRegex(output, 'class htb 2:32 root leaf 32:')
-        self.assertRegex(output, 'class htb 2:33 root leaf 33:')
-        self.assertRegex(output, 'class htb 2:34 root leaf 34:')
-        self.assertRegex(output, 'class htb 2:35 root leaf 35:')
-        self.assertRegex(output, 'class htb 2:36 root leaf 36:')
-        self.assertRegex(output, 'class htb 2:37 root leaf 37:')
-        self.assertRegex(output, 'class htb 2:38 root leaf 38:')
-        self.assertRegex(output, 'class htb 2:39 root leaf 39:')
-        self.assertRegex(output, 'class htb 2:3a root leaf 3a:')
-        self.assertRegex(output, 'class htb 2:3b root leaf 3b:')
-        self.assertRegex(output, 'class htb 2:3c root leaf 3c:')
+        # Here (:|prio) is a workaround for a bug in iproute2 v6.2.0 caused by
+        # https://github.com/shemminger/iproute2/commit/010a8388aea11e767ba3a2506728b9ad9760df0e
+        # which is fixed in v6.3.0 by
+        # https://github.com/shemminger/iproute2/commit/4e0e56e0ef05387f7f5d8ab41fe6ec6a1897b26d
+        self.assertRegex(output, 'class htb 2:30 root leaf 30(:|prio) ')
+        self.assertRegex(output, 'class htb 2:31 root leaf 31(:|prio) ')
+        self.assertRegex(output, 'class htb 2:32 root leaf 32(:|prio) ')
+        self.assertRegex(output, 'class htb 2:33 root leaf 33(:|prio) ')
+        self.assertRegex(output, 'class htb 2:34 root leaf 34(:|prio) ')
+        self.assertRegex(output, 'class htb 2:35 root leaf 35(:|prio) ')
+        self.assertRegex(output, 'class htb 2:36 root leaf 36(:|prio) ')
+        self.assertRegex(output, 'class htb 2:37 root leaf 37(:|prio) ')
+        self.assertRegex(output, 'class htb 2:38 root leaf 38(:|prio) ')
+        self.assertRegex(output, 'class htb 2:39 root leaf 39(:|prio) ')
+        self.assertRegex(output, 'class htb 2:3a root leaf 3a(:|prio) ')
+        self.assertRegex(output, 'class htb 2:3b root leaf 3b(:|prio) ')
+        self.assertRegex(output, 'class htb 2:3c root leaf 3c(:|prio) ')
+
         self.assertRegex(output, 'prio 1 quantum 4000 rate 1Mbit overhead 100 ceil 500Kbit')
         self.assertRegex(output, 'burst 123456')
         self.assertRegex(output, 'cburst 123457')