test/e2e: adapt DoTestRestrictivePolicyBlocksExec for CRI-O

The DoTestRestrictivePolicyBlocksExec test for CRI-O will have the "error executing command in container" error message instead of "failed to exec in container". So adjusted the expected strings on the error message to consider the output of CRI-O too. Signed-off-by: Wainer dos Santos Moschetta <[email protected]>
confidential-containers · Oct 3, 2024 · 61ef281 · 61ef281
1 parent a33d3aa
commit 61ef281
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/cloud-api-adaptor/test/e2e/common_suite.go b/src/cloud-api-adaptor/test/e2e/common_suite.go
@@ -632,8 +632,10 @@ func DoTestRestrictivePolicyBlocksExec(t *testing.T, e env.Environment, assert C
 			Command:       []string{"ls"},
 			ContainerName: pod.Spec.Containers[0].Name,
 			TestErrorFn: func(err error) bool {
-				if strings.Contains(err.Error(), "failed to exec in container") && strings.Contains(err.Error(), "ExecProcessRequest is blocked by policy") {
-					t.Logf("Exec process was blocked %s", err.Error())
+				if (strings.Contains(err.Error(), "failed to exec in container") || // containerd
+					strings.Contains(err.Error(), "error executing command in container")) && // cri-o
+					strings.Contains(err.Error(), "ExecProcessRequest is blocked by policy") {
+					t.Logf("Exec process was blocked: %s", err.Error())
 					return true
 				} else {
 					t.Errorf("Exec process was allowed: %s", err.Error())