Skip to content

Commit a4bef2a

Browse files
yuwatabluca
authored andcommitted
test-network: add workaround for bug in iproute2 v6.2.0
Closes #27473. (cherry picked from commit 8e2449a) (cherry picked from commit 8813826)
1 parent 7eefa3f commit a4bef2a

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3552,10 +3552,14 @@ def test_qdisc_htb_fifo(self):
35523552

35533553
output = check_output('tc -d class show dev dummy98')
35543554
print(output)
3555-
self.assertRegex(output, 'class htb 2:37 root leaf 37:')
3556-
self.assertRegex(output, 'class htb 2:3a root leaf 3a:')
3557-
self.assertRegex(output, 'class htb 2:3b root leaf 3b:')
3558-
self.assertRegex(output, 'class htb 2:3c root leaf 3c:')
3555+
# Here (:|prio) is a workaround for a bug in iproute2 v6.2.0 caused by
3556+
# https://github.com/shemminger/iproute2/commit/010a8388aea11e767ba3a2506728b9ad9760df0e
3557+
# which is fixed in v6.3.0 by
3558+
# https://github.com/shemminger/iproute2/commit/4e0e56e0ef05387f7f5d8ab41fe6ec6a1897b26d
3559+
self.assertRegex(output, 'class htb 2:37 root leaf 37(:|prio) ')
3560+
self.assertRegex(output, 'class htb 2:3a root leaf 3a(:|prio) ')
3561+
self.assertRegex(output, 'class htb 2:3b root leaf 3b(:|prio) ')
3562+
self.assertRegex(output, 'class htb 2:3c root leaf 3c(:|prio) ')
35593563
self.assertRegex(output, 'prio 1 quantum 4000 rate 1Mbit overhead 100 ceil 500Kbit')
35603564
self.assertRegex(output, 'burst 123456')
35613565
self.assertRegex(output, 'cburst 123457')

0 commit comments

Comments
 (0)