From f77b05af16a49da6adfe9c3c3dfeec071c2a3686 Mon Sep 17 00:00:00 2001 From: Jiri Olsa Date: Sat, 17 Aug 2024 18:05:11 +0000 Subject: [PATCH] tetragon: Add missing calls to DeleteTracingPolicy in kprobe tests We're missing cleanup in some kprobe tests, so we get leftovers in the tetragon directory, like: time="2024-08-17T18:01:54Z" level=info msg="`gkp-sensor-3-multi_kprobe-string_maps_5` still exists after test" time="2024-08-17T18:01:54Z" level=info msg="`gkp-sensor-3-multi_kprobe-string_maps_6` still exists after test" time="2024-08-17T18:01:54Z" level=info msg="`gkp-sensor-3-multi_kprobe-string_maps_7` still exists after test" Adding missing DeleteTracingPolicy cleanup call. Signed-off-by: Jiri Olsa --- pkg/sensors/tracing/kprobe_test.go | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/pkg/sensors/tracing/kprobe_test.go b/pkg/sensors/tracing/kprobe_test.go index 5c25b9121c3..8a0d5749d41 100644 --- a/pkg/sensors/tracing/kprobe_test.go +++ b/pkg/sensors/tracing/kprobe_test.go @@ -4001,7 +4001,11 @@ func matchBinariesPerfringTest(t *testing.T, operator string, values []string) { } err := sm.Manager.AddTracingPolicy(ctx, &matchBinariesTracingPolicy) - assert.NoError(t, err) + if assert.NoError(t, err) { + t.Cleanup(func() { + sm.Manager.DeleteTracingPolicy(ctx, "match-binaries", "") + }) + } var tailPID, headPID int ops := func() { @@ -4112,7 +4116,11 @@ func TestKprobeMatchBinariesEarlyExec(t *testing.T) { } err = sm.Manager.AddTracingPolicy(ctx, &matchBinariesTracingPolicy) - assert.NoError(t, err) + if assert.NoError(t, err) { + t.Cleanup(func() { + sm.Manager.DeleteTracingPolicy(ctx, "match-binaries", "") + }) + } ops := func() { file.WriteString("trigger!") @@ -4188,7 +4196,11 @@ func TestKprobeMatchBinariesPrefixMatchArgs(t *testing.T) { } err := sm.Manager.AddTracingPolicy(ctx, &matchBinariesTracingPolicy) - assert.NoError(t, err) + if assert.NoError(t, err) { + t.Cleanup(func() { + sm.Manager.DeleteTracingPolicy(ctx, "match-binaries", "") + }) + } var tailEtcPID, tailProcPID, headPID int ops := func() { @@ -6123,7 +6135,11 @@ func TestLinuxBinprmExtractPath(t *testing.T) { } err := sm.Manager.AddTracingPolicy(ctx, &bprmTracingPolicy) - assert.NoError(t, err) + if assert.NoError(t, err) { + t.Cleanup(func() { + sm.Manager.DeleteTracingPolicy(ctx, "bprm-extract-path", "") + }) + } targetCommand := exec.Command("/usr/bin/id") filteredCommand := exec.Command("/usr/bin/uname")