From 8eff7cd98f66144074b2ada9aedf86a8c0c90fef Mon Sep 17 00:00:00 2001 From: Christian Boltz Date: Sun, 20 Oct 2024 22:59:14 +0200 Subject: [PATCH] test-multi: no longer expect testcase01, 12 and 13 to fail 'testcase01', 'testcase12' and 'testcase13' contain a strange mix of exec and network events. Nevertheless, there's enough information to parse them as good-enough exec events. While this is not perfectly correct, it's better than skipping these logs in this test. Stop expecting that these profiles have a wrong content, and adjust them so that they contain the (somewhat) expected exec rule. --- .../libapparmor/testsuite/test_multi/testcase01.profile | 2 +- .../libapparmor/testsuite/test_multi/testcase12.profile | 2 +- .../libapparmor/testsuite/test_multi/testcase13.profile | 2 +- utils/test/test-libapparmor-test_multi.py | 5 ----- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/libraries/libapparmor/testsuite/test_multi/testcase01.profile b/libraries/libapparmor/testsuite/test_multi/testcase01.profile index eaa4fec49..29e926280 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase01.profile +++ b/libraries/libapparmor/testsuite/test_multi/testcase01.profile @@ -1,4 +1,4 @@ /bin/ping { - ping2 ix, + /bin/ping mrix, } diff --git a/libraries/libapparmor/testsuite/test_multi/testcase12.profile b/libraries/libapparmor/testsuite/test_multi/testcase12.profile index 9a377e0c8..29e926280 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase12.profile +++ b/libraries/libapparmor/testsuite/test_multi/testcase12.profile @@ -1,4 +1,4 @@ /bin/ping { - /bin/ping ix, + /bin/ping mrix, } diff --git a/libraries/libapparmor/testsuite/test_multi/testcase13.profile b/libraries/libapparmor/testsuite/test_multi/testcase13.profile index 9a377e0c8..29e926280 100644 --- a/libraries/libapparmor/testsuite/test_multi/testcase13.profile +++ b/libraries/libapparmor/testsuite/test_multi/testcase13.profile @@ -1,4 +1,4 @@ /bin/ping { - /bin/ping ix, + /bin/ping mrix, } diff --git a/utils/test/test-libapparmor-test_multi.py b/utils/test/test-libapparmor-test_multi.py index d9e0445c1..f4b8adb03 100644 --- a/utils/test/test-libapparmor-test_multi.py +++ b/utils/test/test-libapparmor-test_multi.py @@ -152,11 +152,6 @@ log_to_skip = [ # tests that do not produce the expected profile (checked with assertNotEqual) log_to_profile_known_failures = [ - # exec events - 'testcase01', - 'testcase12', - 'testcase13', - # 'testcase31', # works, but including the link source would be nice ]