diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-10 23:46:38 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-12-11 00:06:31 +0900 |
| commit | 40821c2ac3a7aacda8ba5d719bdfd24629c56ebe (patch) | |
| tree | ae61bdc13830aca5428868149c68065a3e50050a | |
| parent | 4e5ef1491901959a251e13d6b84f481540ee1ed4 (diff) | |
| download | systemd-40821c2ac3a7aacda8ba5d719bdfd24629c56ebe.tar.gz | |
test-network: add a test case for fq-codel
| -rw-r--r-- | test/test-network/conf/25-qdisc-netem-and-fqcodel.network (renamed from test/test-network/conf/25-qdisc-netem.network) | 7 | ||||
| -rwxr-xr-x | test/test-network/systemd-networkd-tests.py | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/test/test-network/conf/25-qdisc-netem.network b/test/test-network/conf/25-qdisc-netem-and-fqcodel.network index de8f7243ce..b7defa3313 100644 --- a/test/test-network/conf/25-qdisc-netem.network +++ b/test/test-network/conf/25-qdisc-netem-and-fqcodel.network @@ -13,8 +13,5 @@ NetworkEmulatorLossRate=20% NetworkEmulatorPacketLimit=100 [TrafficControlQueueingDiscipline] -Parent=clsact -NetworkEmulatorDelaySec=100ms -NetworkEmulatorDelayJitterSec=13ms -NetworkEmulatorLossRate=20.5% -NetworkEmulatorPacketLimit=200 +Parent=ingress +FairQueuingControlledDelayPacketLimit=20480 diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index 9d22d788dd..a72b9abf76 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -1509,7 +1509,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): '25-neighbor-ip-dummy.network', '25-neighbor-ip.network', '25-nexthop.network', - '25-qdisc-netem.network', + '25-qdisc-netem-and-fqcodel.network', '25-qdisc-tbf-and-sfq.network', '25-route-ipv6-src.network', '25-route-static.network', @@ -2083,7 +2083,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): self.assertRegex(output, '192.168.5.1') def test_qdisc(self): - copy_unit_to_networkd_unit_path('25-qdisc-netem.network', '12-dummy.netdev', + copy_unit_to_networkd_unit_path('25-qdisc-netem-and-fqcodel.network', '12-dummy.netdev', '25-qdisc-tbf-and-sfq.network', '11-dummy.netdev') start_networkd() @@ -2093,7 +2093,8 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities): print(output) self.assertRegex(output, 'qdisc netem') self.assertRegex(output, 'limit 100 delay 50.0ms 10.0ms loss 20%') - self.assertRegex(output, 'limit 200 delay 100.0ms 13.0ms loss 20.5%') + self.assertRegex(output, 'qdisc fq_codel') + self.assertRegex(output, 'limit 20480p') output = check_output('tc qdisc show dev test1') print(output) self.assertRegex(output, 'qdisc tbf') |