Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 196640a6 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ns-plugin-fixes' 



Vlad Buslov says:

====================
Fix problems with using ns plugin

Recent changes to plugin architecture broke some of the tests when running tdc
without specifying a test group. Fix tests incompatible with ns plugin and
modify tests to not reuse interface name of ns veth interface for dummy
interface.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6636fb31 14b54ac4

tools/testing/selftests/tc-testing/tc-tests/filters/concurrency.json

+9 −9
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
            "$TC qdisc add dev $DEV2 ingress",

            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 add"

        ],

        "cmdUnderTest": "find $BATCH_DIR/add* -print | xargs -n 1 -P 10 $TC -b",

        "cmdUnderTest": "bash -c \"find $BATCH_DIR/add* -print | xargs -n 1 -P 10 $TC -b\"",

        "expExitCode": "0",

        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",

        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -37,7 +37,7 @@ 
            "$TC -b $BATCH_DIR/add_0",

            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 del"

        ],

        "cmdUnderTest": "find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -b",

        "cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -b\"",

        "expExitCode": "0",

        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",

        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -62,7 +62,7 @@ 
            "$TC -b $BATCH_DIR/add_0",

            "./tdc_multibatch.py $DEV2 $BATCH_DIR 100000 10 replace"

        ],

        "cmdUnderTest": "find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b",

        "cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",

        "expExitCode": "0",

        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",

        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -87,7 +87,7 @@ 
            "$TC -b $BATCH_DIR/add_0",

            "./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 replace"

        ],

        "cmdUnderTest": "find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b",

        "cmdUnderTest": "bash -c \"find $BATCH_DIR/replace* -print | xargs -n 1 -P 10 $TC -b\"",

        "expExitCode": "0",

        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",

        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -112,7 +112,7 @@ 
            "$TC -b $BATCH_DIR/add_0",

            "./tdc_multibatch.py -d $DEV2 $BATCH_DIR 100000 10 del"

        ],

        "cmdUnderTest": "find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -f -b",

        "cmdUnderTest": "bash -c \"find $BATCH_DIR/del* -print | xargs -n 1 -P 10 $TC -f -b\"",

        "expExitCode": "123",

        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",

        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -134,11 +134,11 @@ 
            "/bin/mkdir $BATCH_DIR",

            "$TC qdisc add dev $DEV2 ingress",

            "./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 5 add",

            "find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b",

            "bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",

            "./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 add",

            "./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"

        ],

        "cmdUnderTest": "find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b",

        "cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",

        "expExitCode": "0",

        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",

        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",
@@ -160,11 +160,11 @@ 
            "/bin/mkdir $BATCH_DIR",

            "$TC qdisc add dev $DEV2 ingress",

            "./tdc_multibatch.py -x init_ $DEV2 $BATCH_DIR 100000 10 add",

            "find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b",

            "bash -c \"find $BATCH_DIR/init_* -print | xargs -n 1 -P 5 $TC -b\"",

            "./tdc_multibatch.py -x par_ -a 500001 -m 5 $DEV2 $BATCH_DIR 100000 5 replace",

            "./tdc_multibatch.py -x par_ $DEV2 $BATCH_DIR 100000 5 del"

        ],

        "cmdUnderTest": "find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b",

        "cmdUnderTest": "bash -c \"find $BATCH_DIR/par_* -print | xargs -n 1 -P 10 $TC -b\"",

        "expExitCode": "0",

        "verifyCmd": "$TC -s filter show dev $DEV2 ingress",

        "matchPattern": "filter protocol ip pref 1 flower chain 0 handle",

tools/testing/selftests/tc-testing/tc-tests/filters/matchall.json

+121 −121

File changed.

Preview size limit exceeded, changes collapsed.

tools/testing/selftests/tc-testing/tc-tests/qdiscs/fifo.json

+75 −75
Original line number Diff line number Diff line
@@ -8,16 +8,16 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root bfifo",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root bfifo",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root.*limit [0-9]+b",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle 1: root bfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle 1: root bfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -29,16 +29,16 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root pfifo",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root pfifo",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc pfifo 1: root.*limit [0-9]+p",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle 1: root pfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle 1: root pfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -49,16 +49,16 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 root handle ffff: bfifo",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY root handle ffff: bfifo",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo ffff: root.*limit [0-9]+b",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle ffff: root bfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle ffff: root bfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -69,16 +69,16 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root bfifo limit 3000b",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root bfifo limit 3000b",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root.*limit 3000b",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle 1: root bfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle 1: root bfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -89,16 +89,16 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 txqueuelen 3000 type dummy || /bin/true"

            "$IP link add dev $DUMMY txqueuelen 3000 type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root pfifo limit 3000",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root pfifo limit 3000",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc pfifo 1: root.*limit 3000p",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle 1: root pfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle 1: root pfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -109,15 +109,15 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 root handle 10000: bfifo",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY root handle 10000: bfifo",

        "expExitCode": "255",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 10000: root.*limit [0-9]+b",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -128,15 +128,15 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root bfifo foorbar",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root bfifo foorbar",

        "expExitCode": "1",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -147,15 +147,15 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root pfifo foorbar",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root pfifo foorbar",

        "expExitCode": "1",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc pfifo 1: root",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -166,18 +166,18 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link del dev $DEV1 type dummy || /bin/true",

            "$IP link add dev $DEV1 txqueuelen 1000 type dummy",

            "$TC qdisc add dev $DEV1 handle 1: root bfifo"

            "$IP link del dev $DUMMY type dummy || /bin/true",

            "$IP link add dev $DUMMY txqueuelen 1000 type dummy",

            "$TC qdisc add dev $DUMMY handle 1: root bfifo"

        ],

        "cmdUnderTest": "$TC qdisc replace dev $DEV1 handle 1: root bfifo limit 3000b",

        "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root bfifo limit 3000b",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root.*limit 3000b",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle 1: root bfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle 1: root bfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -188,18 +188,18 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link del dev $DEV1 type dummy || /bin/true",

            "$IP link add dev $DEV1 txqueuelen 1000 type dummy",

            "$TC qdisc add dev $DEV1 handle 1: root pfifo"

            "$IP link del dev $DUMMY type dummy || /bin/true",

            "$IP link add dev $DUMMY txqueuelen 1000 type dummy",

            "$TC qdisc add dev $DUMMY handle 1: root pfifo"

        ],

        "cmdUnderTest": "$TC qdisc replace dev $DEV1 handle 1: root pfifo limit 30",

        "cmdUnderTest": "$TC qdisc replace dev $DUMMY handle 1: root pfifo limit 30",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc pfifo 1: root.*limit 30p",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle 1: root pfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle 1: root pfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -210,15 +210,15 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root bfifo limit foo-bar",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root bfifo limit foo-bar",

        "expExitCode": "1",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root.*limit foo-bar",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -229,17 +229,17 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true",

            "$TC qdisc add dev $DEV1 handle 1: root bfifo"

            "$IP link add dev $DUMMY type dummy || /bin/true",

            "$TC qdisc add dev $DUMMY handle 1: root bfifo"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 handle 1: root bfifo",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY handle 1: root bfifo",

        "expExitCode": "2",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 handle 1: root bfifo",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY handle 1: root bfifo",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -250,15 +250,15 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc del dev $DEV1 root handle 1: bfifo",

        "cmdUnderTest": "$TC qdisc del dev $DUMMY root handle 1: bfifo",

        "expExitCode": "2",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -269,15 +269,15 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 root handle 123^ bfifo limit 100b",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY root handle 123^ bfifo limit 100b",

        "expExitCode": "255",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 123 root",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -288,17 +288,17 @@ 
            "fifo"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true",

            "$TC qdisc add dev $DEV1 root handle 1: bfifo",

            "$TC qdisc del dev $DEV1 root handle 1: bfifo"

            "$IP link add dev $DUMMY type dummy || /bin/true",

            "$TC qdisc add dev $DUMMY root handle 1: bfifo",

            "$TC qdisc del dev $DUMMY root handle 1: bfifo"

        ],

        "cmdUnderTest": "$TC qdisc del dev $DEV1 handle 1: root bfifo",

        "cmdUnderTest": "$TC qdisc del dev $DUMMY handle 1: root bfifo",

        "expExitCode": "2",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc bfifo 1: root",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    }

]

tools/testing/selftests/tc-testing/tc-tests/qdiscs/ingress.json

+25 −25
Original line number Diff line number Diff line
@@ -7,16 +7,16 @@ 
            "ingress"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 ingress",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY ingress",

        "expExitCode": "0",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc ingress ffff:",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 ingress",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY ingress",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -27,15 +27,15 @@ 
            "ingress"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 ingress foorbar",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY ingress foorbar",

        "expExitCode": "1",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc ingress ffff:",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -46,17 +46,17 @@ 
            "ingress"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true",

            "$TC qdisc add dev $DEV1 ingress"

            "$IP link add dev $DUMMY type dummy || /bin/true",

            "$TC qdisc add dev $DUMMY ingress"

        ],

        "cmdUnderTest": "$TC qdisc add dev $DEV1 ingress",

        "cmdUnderTest": "$TC qdisc add dev $DUMMY ingress",

        "expExitCode": "2",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc ingress ffff:",

        "matchCount": "1",

        "teardown": [

            "$TC qdisc del dev $DEV1 ingress",

            "$IP link del dev $DEV1 type dummy"

            "$TC qdisc del dev $DUMMY ingress",

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -67,15 +67,15 @@ 
            "ingress"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true"

            "$IP link add dev $DUMMY type dummy || /bin/true"

        ],

        "cmdUnderTest": "$TC qdisc del dev $DEV1 ingress",

        "cmdUnderTest": "$TC qdisc del dev $DUMMY ingress",

        "expExitCode": "2",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc ingress ffff:",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    },

    {
@@ -86,17 +86,17 @@ 
            "ingress"

        ],

        "setup": [

            "$IP link add dev $DEV1 type dummy || /bin/true",

            "$TC qdisc add dev $DEV1 ingress",

            "$TC qdisc del dev $DEV1 ingress"

            "$IP link add dev $DUMMY type dummy || /bin/true",

            "$TC qdisc add dev $DUMMY ingress",

            "$TC qdisc del dev $DUMMY ingress"

        ],

        "cmdUnderTest": "$TC qdisc del dev $DEV1 ingress",

        "cmdUnderTest": "$TC qdisc del dev $DUMMY ingress",

        "expExitCode": "2",

        "verifyCmd": "$TC qdisc show dev $DEV1",

        "verifyCmd": "$TC qdisc show dev $DUMMY",

        "matchPattern": "qdisc ingress ffff:",

        "matchCount": "0",

        "teardown": [

            "$IP link del dev $DEV1 type dummy"

            "$IP link del dev $DUMMY type dummy"

        ]

    }

]

tools/testing/selftests/tc-testing/tc-tests/qdiscs/prio.json

+64 −64

File changed.

Preview size limit exceeded, changes collapsed.