Commit 756f88ff authored by Jonathan Lennox's avatar Jonathan Lennox Committed by Paolo Abeni
Browse files

tc-tests: Update tc police action tests for tc buffer size rounding fixes. 



Before tc's recent change to fix rounding errors, several tests which
specified a burst size of "1m" would translate back to being 1048574
bytes (2b less than 1Mb).  sprint_size prints this as "1024Kb".

With the tc fix, the burst size is instead correctly reported as
1048576 bytes (precisely 1Mb), which sprint_size prints as "1Mb".

This updates the expected output in the tests' matchPattern values
to accept either the old or the new output.

Signed-off-by: default avatarJonathan Lennox <jonathan.lennox@8x8.com>
Link: https://patch.msgid.link/20250312174804.313107-1-jonathan.lennox@8x8.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent d3c58b65

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

+5 −5
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ 
        "cmdUnderTest": "$TC actions add action police rate 7mbit burst 1m continue index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action police index 1",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst 1024Kb mtu 2Kb action continue",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst (1024Kb|1Mb) mtu 2Kb action continue",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action police"
@@ -716,7 +716,7 @@ 
        "cmdUnderTest": "$TC actions add action police rate 7mbit burst 1m drop index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions ls action police",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst 1024Kb mtu 2Kb action drop",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst (1024Kb|1Mb) mtu 2Kb action drop",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action police"
@@ -743,7 +743,7 @@ 
        "cmdUnderTest": "$TC actions add action police rate 7mbit burst 1m ok index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions ls action police",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst 1024Kb mtu 2Kb action pass",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst (1024Kb|1Mb) mtu 2Kb action pass",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action police"
@@ -770,7 +770,7 @@ 
        "cmdUnderTest": "$TC actions add action police rate 7mbit burst 1m reclassify index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions get action police index 1",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst 1024Kb mtu 2Kb action reclassify",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst (1024Kb|1Mb) mtu 2Kb action reclassify",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action police"
@@ -797,7 +797,7 @@ 
        "cmdUnderTest": "$TC actions add action police rate 7mbit burst 1m pipe index 1",

        "expExitCode": "0",

        "verifyCmd": "$TC actions ls action police",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst 1024Kb mtu 2Kb action pipe",

        "matchPattern": "action order [0-9]*:  police 0x1 rate 7Mbit burst (1024Kb|1Mb) mtu 2Kb action pipe",

        "matchCount": "1",

        "teardown": [

            "$TC actions flush action police"