leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftests/bpf: add Error: prefix in check_extack helper

Browse Source 
Currently the test only checks errors, not warnings, so save typing
and prefix the extack messages with "Error:" inside the check helper.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Jakub Kicinski 2018-07-10 14:42:56 -07:00 committed by Daniel Borkmann
parent 7479efc71f
commit 219f860d2a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/testing/selftests/bpf/test_offload.py
View File

@ -547,11 +547,11 @@ def check_extack(output, reference, args):
if skip_extack: if skip_extack:
return return
lines = output.split("\n") lines = output.split("\n")
comp = len(lines) >= 2 and lines[1] == reference comp = len(lines) >= 2 and lines[1] == 'Error: ' + reference
fail(not comp, "Missing or incorrect netlink extack message") fail(not comp, "Missing or incorrect netlink extack message")
def check_extack_nsim(output, reference, args): def check_extack_nsim(output, reference, args):
check_extack(output, "Error: netdevsim: " + reference, args) check_extack(output, "netdevsim: " + reference, args)
def check_no_extack(res, needle): def check_no_extack(res, needle):
fail((res[1] + res[2]).count(needle) or (res[1] + res[2]).count("Warning:"), fail((res[1] + res[2]).count(needle) or (res[1] + res[2]).count("Warning:"),
@ -654,7 +654,7 @@ try:
ret, _, err = sim.cls_bpf_add_filter(obj, skip_sw=True, ret, _, err = sim.cls_bpf_add_filter(obj, skip_sw=True,
fail=False, include_stderr=True) fail=False, include_stderr=True)
fail(ret == 0, "TC filter loaded without enabling TC offloads") fail(ret == 0, "TC filter loaded without enabling TC offloads")
check_extack(err, "Error: TC offload is disabled on net device.", args) check_extack(err, "TC offload is disabled on net device.", args)
sim.wait_for_flush() sim.wait_for_flush()
sim.set_ethtool_tc_offloads(True) sim.set_ethtool_tc_offloads(True)
@ -694,7 +694,7 @@ try:
skip_sw=True, skip_sw=True,
fail=False, include_stderr=True) fail=False, include_stderr=True)
fail(ret == 0, "Offloaded a filter to chain other than 0") fail(ret == 0, "Offloaded a filter to chain other than 0")
check_extack(err, "Error: Driver supports only offload of chain 0.", args) check_extack(err, "Driver supports only offload of chain 0.", args)
sim.tc_flush_filters() sim.tc_flush_filters()
start_test("Test TC replace...") start_test("Test TC replace...")