Commit 52158f00 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann

selftests/bpf: fix the expected messages

Recent changes added extack to program replacement path,
expect extack instead of generic messages.

Fixes: 01dde20c ("xdp: Provide extack messages when prog attachment failed")
Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent f7748e29
...@@ -842,7 +842,9 @@ try: ...@@ -842,7 +842,9 @@ try:
ret, _, err = sim.set_xdp(obj, "generic", force=True, ret, _, err = sim.set_xdp(obj, "generic", force=True,
fail=False, include_stderr=True) fail=False, include_stderr=True)
fail(ret == 0, "Replaced XDP program with a program in different mode") fail(ret == 0, "Replaced XDP program with a program in different mode")
fail(err.count("File exists") != 1, "Replaced driver XDP with generic") check_extack(err,
"native and generic XDP can't be active at the same time.",
args)
ret, _, err = sim.set_xdp(obj, "", force=True, ret, _, err = sim.set_xdp(obj, "", force=True,
fail=False, include_stderr=True) fail=False, include_stderr=True)
fail(ret == 0, "Replaced XDP program with a program in different mode") fail(ret == 0, "Replaced XDP program with a program in different mode")
...@@ -957,7 +959,8 @@ try: ...@@ -957,7 +959,8 @@ try:
start_test("Test multi-attachment XDP - replace...") start_test("Test multi-attachment XDP - replace...")
ret, _, err = sim.set_xdp(obj, "offload", fail=False, include_stderr=True) ret, _, err = sim.set_xdp(obj, "offload", fail=False, include_stderr=True)
fail(err.count("busy") != 1, "Replaced one of programs without -force") fail(ret == 0, "Replaced one of programs without -force")
check_extack(err, "XDP program already attached.", args)
start_test("Test multi-attachment XDP - detach...") start_test("Test multi-attachment XDP - detach...")
ret, _, err = sim.unset_xdp("drv", force=True, ret, _, err = sim.unset_xdp("drv", force=True,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment