tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

tc-testing: remove duplicate spaces in skbedit match patterns

Match patterns for some skbedit tests contain duplicate whitespace that is
not present in actual tc output. This causes tests to fail because they
can't match required action, even when it was successfully created.

Signed-off-by: Vlad Buslov <vladbu@mellanox.com>
Acked-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Vlad Buslov and committed by
David S. Miller 98146703 757a9a39

+13 -13
+13 -13
tools/testing/selftests/tc-testing/tc-tests/actions/skbedit.json
··· 17 17 "cmdUnderTest": "$TC actions add action skbedit mark 1", 18 18 "expExitCode": "0", 19 19 "verifyCmd": "$TC actions list action skbedit", 20 - "matchPattern": "action order [0-9]*: skbedit mark 1", 20 + "matchPattern": "action order [0-9]*: skbedit mark 1", 21 21 "matchCount": "1", 22 22 "teardown": [ 23 23 "$TC actions flush action skbedit" ··· 65 65 "cmdUnderTest": "$TC actions add action skbedit prio 99", 66 66 "expExitCode": "0", 67 67 "verifyCmd": "$TC actions list action skbedit", 68 - "matchPattern": "action order [0-9]*: skbedit priority :99", 68 + "matchPattern": "action order [0-9]*: skbedit priority :99", 69 69 "matchCount": "1", 70 70 "teardown": [ 71 71 "$TC actions flush action skbedit" ··· 113 113 "cmdUnderTest": "$TC actions add action skbedit queue_mapping 909", 114 114 "expExitCode": "0", 115 115 "verifyCmd": "$TC actions list action skbedit", 116 - "matchPattern": "action order [0-9]*: skbedit queue_mapping 909", 116 + "matchPattern": "action order [0-9]*: skbedit queue_mapping 909", 117 117 "matchCount": "1", 118 118 "teardown": [ 119 119 "$TC actions flush action skbedit" ··· 161 161 "cmdUnderTest": "$TC actions add action skbedit ptype host", 162 162 "expExitCode": "0", 163 163 "verifyCmd": "$TC actions list action skbedit", 164 - "matchPattern": "action order [0-9]*: skbedit ptype host", 164 + "matchPattern": "action order [0-9]*: skbedit ptype host", 165 165 "matchCount": "1", 166 166 "teardown": [ 167 167 "$TC actions flush action skbedit" ··· 185 185 "cmdUnderTest": "$TC actions add action skbedit ptype otherhost", 186 186 "expExitCode": "0", 187 187 "verifyCmd": "$TC actions list action skbedit", 188 - "matchPattern": "action order [0-9]*: skbedit ptype otherhost", 188 + "matchPattern": "action order [0-9]*: skbedit ptype otherhost", 189 189 "matchCount": "1", 190 190 "teardown": [ 191 191 "$TC actions flush action skbedit" ··· 233 233 "cmdUnderTest": "$TC actions add action skbedit ptype host pipe index 11", 234 234 "expExitCode": "0", 235 235 "verifyCmd": "$TC actions get action skbedit index 11", 236 - "matchPattern": "action order [0-9]*: skbedit ptype host pipe.*index 11 ref", 236 + "matchPattern": "action order [0-9]*: skbedit ptype host pipe.*index 11 ref", 237 237 "matchCount": "1", 238 238 "teardown": [ 239 239 "$TC actions flush action skbedit" ··· 257 257 "cmdUnderTest": "$TC actions add action skbedit mark 56789 reclassify index 90", 258 258 "expExitCode": "0", 259 259 "verifyCmd": "$TC actions get action skbedit index 90", 260 - "matchPattern": "action order [0-9]*: skbedit mark 56789 reclassify.*index 90 ref", 260 + "matchPattern": "action order [0-9]*: skbedit mark 56789 reclassify.*index 90 ref", 261 261 "matchCount": "1", 262 262 "teardown": [ 263 263 "$TC actions flush action skbedit" ··· 281 281 "cmdUnderTest": "$TC actions add action skbedit queue_mapping 3 pass index 271", 282 282 "expExitCode": "0", 283 283 "verifyCmd": "$TC actions get action skbedit index 271", 284 - "matchPattern": "action order [0-9]*: skbedit queue_mapping 3 pass.*index 271 ref", 284 + "matchPattern": "action order [0-9]*: skbedit queue_mapping 3 pass.*index 271 ref", 285 285 "matchCount": "1", 286 286 "teardown": [ 287 287 "$TC actions flush action skbedit" ··· 305 305 "cmdUnderTest": "$TC actions add action skbedit queue_mapping 3 drop index 271", 306 306 "expExitCode": "0", 307 307 "verifyCmd": "$TC actions get action skbedit index 271", 308 - "matchPattern": "action order [0-9]*: skbedit queue_mapping 3 drop.*index 271 ref", 308 + "matchPattern": "action order [0-9]*: skbedit queue_mapping 3 drop.*index 271 ref", 309 309 "matchCount": "1", 310 310 "teardown": [ 311 311 "$TC actions flush action skbedit" ··· 329 329 "cmdUnderTest": "$TC actions add action skbedit priority 8 jump 9 index 2", 330 330 "expExitCode": "0", 331 331 "verifyCmd": "$TC actions get action skbedit index 2", 332 - "matchPattern": "action order [0-9]*: skbedit priority :8 jump 9.*index 2 ref", 332 + "matchPattern": "action order [0-9]*: skbedit priority :8 jump 9.*index 2 ref", 333 333 "matchCount": "1", 334 334 "teardown": [ 335 335 "$TC actions flush action skbedit" ··· 353 353 "cmdUnderTest": "$TC actions add action skbedit priority 16 continue index 32", 354 354 "expExitCode": "0", 355 355 "verifyCmd": "$TC actions get action skbedit index 32", 356 - "matchPattern": "action order [0-9]*: skbedit priority :16 continue.*index 32 ref", 356 + "matchPattern": "action order [0-9]*: skbedit priority :16 continue.*index 32 ref", 357 357 "matchCount": "1", 358 358 "teardown": [ 359 359 "$TC actions flush action skbedit" ··· 377 377 "cmdUnderTest": "$TC actions add action skbedit priority 16 continue index 32 cookie deadbeef", 378 378 "expExitCode": "0", 379 379 "verifyCmd": "$TC actions get action skbedit index 32", 380 - "matchPattern": "action order [0-9]*: skbedit priority :16 continue.*index 32 ref.*cookie deadbeef", 380 + "matchPattern": "action order [0-9]*: skbedit priority :16 continue.*index 32 ref.*cookie deadbeef", 381 381 "matchCount": "1", 382 382 "teardown": [ 383 383 "$TC actions flush action skbedit" ··· 405 405 "cmdUnderTest": "$TC actions list action skbedit", 406 406 "expExitCode": "0", 407 407 "verifyCmd": "$TC actions list action skbedit", 408 - "matchPattern": "action order [0-9]*: skbedit", 408 + "matchPattern": "action order [0-9]*: skbedit", 409 409 "matchCount": "4", 410 410 "teardown": [ 411 411 "$TC actions flush action skbedit"