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",