Commit d227cc0b authored by Pedro Tammela's avatar Pedro Tammela Committed by Paolo Abeni
Browse files

selftests/tc-testing: update test definitions for local resources 



With resources localized on a per test basis, some tests definitions
either contain redundant commands, were wrong or could be simplified.
Update all of them to match the new requirements.

Tested-by: default avatarDavide Caratti <dcaratti@redhat.com>
Signed-off-by: default avatarPedro Tammela <pctammela@mojatatu.com>
Acked-by: default avatarJamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 98cfbe42

tools/testing/selftests/tc-testing/tc-tests/actions/connmark.json

+45 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -30,6 +33,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -54,6 +60,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -78,6 +87,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -102,6 +114,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -126,6 +141,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -150,6 +168,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -174,6 +195,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -198,6 +222,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -222,6 +249,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -246,6 +276,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -271,6 +304,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -295,6 +331,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -320,6 +359,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",
@@ -345,6 +387,9 @@ 
            "actions",

            "connmark"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action connmark",

tools/testing/selftests/tc-testing/tc-tests/actions/csum.json

+69 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -30,6 +33,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -54,6 +60,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -78,6 +87,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -102,6 +114,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -126,6 +141,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -150,6 +168,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -174,6 +195,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -198,6 +222,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -222,6 +249,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -246,6 +276,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -270,6 +303,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -294,6 +330,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -318,6 +357,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -342,6 +384,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -366,6 +411,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -390,6 +438,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -414,6 +465,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -438,6 +492,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -461,6 +518,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -485,6 +545,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -508,6 +571,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",
@@ -533,6 +599,9 @@ 
            "actions",

            "csum"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action csum",

tools/testing/selftests/tc-testing/tc-tests/actions/ct.json

+54 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -30,6 +33,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -54,6 +60,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -78,6 +87,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -102,6 +114,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -126,6 +141,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -150,6 +168,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -174,6 +195,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -198,6 +222,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -222,6 +249,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -246,6 +276,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -270,6 +303,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -294,6 +330,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -318,6 +357,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -342,6 +384,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -366,6 +411,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -390,6 +438,9 @@ 
            "actions",

            "ct"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ct",
@@ -415,6 +466,9 @@ 
            "ct",

	    "scapy"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

	"plugins": {

		"requires": [

			"nsPlugin",

tools/testing/selftests/tc-testing/tc-tests/actions/ctinfo.json

+36 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC action flush action ctinfo",
@@ -30,6 +33,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",
@@ -54,6 +60,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC action flush action ctinfo",
@@ -78,6 +87,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC action flush action ctinfo",
@@ -102,6 +114,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",
@@ -132,6 +147,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",
@@ -162,6 +180,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",
@@ -192,6 +213,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC action flush action ctinfo",
@@ -219,6 +243,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",
@@ -246,6 +273,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",
@@ -271,6 +301,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",
@@ -295,6 +328,9 @@ 
            "actions",

            "ctinfo"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action ctinfo",

tools/testing/selftests/tc-testing/tc-tests/actions/gact.json

+75 −0
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -30,6 +33,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -54,6 +60,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -78,6 +87,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -102,6 +114,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -126,6 +141,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -150,6 +168,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -175,6 +196,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -199,6 +223,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -223,6 +250,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -252,6 +282,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            "$TC actions add action reclassify index 101",

            "$TC actions add action reclassify index 102",
@@ -273,6 +306,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -298,6 +334,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -323,6 +362,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -348,6 +390,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -373,6 +418,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -398,6 +446,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -422,6 +473,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -448,6 +502,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -473,6 +530,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -497,6 +557,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -521,6 +584,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -544,6 +610,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -568,6 +637,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",
@@ -593,6 +665,9 @@ 
            "actions",

            "gact"

        ],

        "plugins": {

           "requires": "nsPlugin"

        },

        "setup": [

            [

                "$TC actions flush action gact",