From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 13 Dec 2019 12:12:41 +0000 (+0900)
Subject: test-network: add a test case for new FQ settings
X-Git-Tag: v245-rc1~246^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14337%2Fhead;p=thirdparty%2Fsystemd.git

test-network: add a test case for new FQ settings
---

diff --git a/test/test-network/conf/25-qdisc-fq.network b/test/test-network/conf/25-qdisc-fq.network
index 10e0e5b8591..ce41ddf9103 100644
--- a/test/test-network/conf/25-qdisc-fq.network
+++ b/test/test-network/conf/25-qdisc-fq.network
@@ -8,3 +8,11 @@ Address=10.1.2.3/16
 [TrafficControlQueueingDiscipline]
 Parent=root
 FairQueueTrafficPolicingPacketLimit=1000
+FairQueueTrafficPolicingFlowLimit=200
+FairQueueTrafficPolicingQuantum=1500
+FairQueueTrafficPolicingInitialQuantum=13000
+FairQueueTrafficPolicingMaximumRate=1M
+FairQueueTrafficPolicingBuckets=512
+FairQueueTrafficPolicingOrphanMask=511
+FairQueueTrafficPolicingPacing=yes
+FairQueueTrafficPolicingCEThresholdSec=100ms
diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py
index 30e2de8b0d9..007d07c6160 100755
--- a/test/test-network/systemd-networkd-tests.py
+++ b/test/test-network/systemd-networkd-tests.py
@@ -2143,7 +2143,7 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
         output = check_output('tc qdisc show dev dummy98')
         print(output)
         self.assertRegex(output, 'qdisc fq')
-        self.assertRegex(output, 'limit 1000p')
+        self.assertRegex(output, 'limit 1000p flow_limit 200p buckets 512 orphan_mask 511 quantum 1500 initial_quantum 13000 maxrate 1Mbit')
 
 class NetworkdStateFileTests(unittest.TestCase, Utilities):
     links = [