Commit bdf1565f authored by Li Zhijian's avatar Li Zhijian Committed by David S. Miller

selftests/tc-testing: match any qdisc type

We should not always presume all kernels use pfifo_fast as the default qdisc.

For example, a fq_codel qdisk could have below output:
qdisc fq_codel 0: parent 1:4 limit 10240p flows 1024 quantum 1514 target 5ms interval 100ms memory_limit 32Mb ecn drop_batch 64
Reported-by: default avatarkernel test robot <lkp@intel.com>
Suggested-by: default avatarPeilin Ye <peilin.ye@bytedance.com>
Signed-off-by: default avatarLi Zhijian <zhijianx.li@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 65258b9d
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
"cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq",
"expExitCode": "0", "expExitCode": "0",
"verifyCmd": "$TC qdisc show dev $ETH", "verifyCmd": "$TC qdisc show dev $ETH",
"matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]",
"matchCount": "4", "matchCount": "4",
"teardown": [ "teardown": [
"echo \"1\" > /sys/bus/netdevsim/del_device" "echo \"1\" > /sys/bus/netdevsim/del_device"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
"cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq",
"expExitCode": "0", "expExitCode": "0",
"verifyCmd": "$TC qdisc show dev $ETH", "verifyCmd": "$TC qdisc show dev $ETH",
"matchPattern": "qdisc pfifo_fast 0: parent 1:[1-9,a-f][0-9,a-f]{0,2} bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-9,a-f][0-9,a-f]{0,2}",
"matchCount": "256", "matchCount": "256",
"teardown": [ "teardown": [
"echo \"1\" > /sys/bus/netdevsim/del_device" "echo \"1\" > /sys/bus/netdevsim/del_device"
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
"cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq",
"expExitCode": "2", "expExitCode": "2",
"verifyCmd": "$TC qdisc show dev $ETH", "verifyCmd": "$TC qdisc show dev $ETH",
"matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]",
"matchCount": "4", "matchCount": "4",
"teardown": [ "teardown": [
"echo \"1\" > /sys/bus/netdevsim/del_device" "echo \"1\" > /sys/bus/netdevsim/del_device"
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
"cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: mq", "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: mq",
"expExitCode": "2", "expExitCode": "2",
"verifyCmd": "$TC qdisc show dev $ETH", "verifyCmd": "$TC qdisc show dev $ETH",
"matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]",
"matchCount": "0", "matchCount": "0",
"teardown": [ "teardown": [
"echo \"1\" > /sys/bus/netdevsim/del_device" "echo \"1\" > /sys/bus/netdevsim/del_device"
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
"cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: mq", "cmdUnderTest": "$TC qdisc del dev $ETH root handle 1: mq",
"expExitCode": "2", "expExitCode": "2",
"verifyCmd": "$TC qdisc show dev $ETH", "verifyCmd": "$TC qdisc show dev $ETH",
"matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]",
"matchCount": "0", "matchCount": "0",
"teardown": [ "teardown": [
"echo \"1\" > /sys/bus/netdevsim/del_device" "echo \"1\" > /sys/bus/netdevsim/del_device"
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
"cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq", "cmdUnderTest": "$TC qdisc add dev $ETH root handle 1: mq",
"expExitCode": "2", "expExitCode": "2",
"verifyCmd": "$TC qdisc show dev $ETH", "verifyCmd": "$TC qdisc show dev $ETH",
"matchPattern": "qdisc pfifo_fast 0: parent 1:[1-4] bands 3 priomap 1 2 2 2 1 2 0 0 1 1 1 1 1 1 1 1", "matchPattern": "qdisc [a-zA-Z0-9_]+ 0: parent 1:[1-4]",
"matchCount": "0", "matchCount": "0",
"teardown": [ "teardown": [
"echo \"1\" > /sys/bus/netdevsim/del_device" "echo \"1\" > /sys/bus/netdevsim/del_device"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment