Hide policy tests behind LCOWIntegrity feature flag

Signed-off-by: Maksim An <maksiman@microsoft.com>
microsoft · Mar 14, 2022 · 1c2ea78 · 1c2ea78
1 parent 083d81d
commit 1c2ea78
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/test/cri-containerd/layer_integrity_test.go b/test/cri-containerd/layer_integrity_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func Test_LCOW_Layer_Integrity(t *testing.T) {
-	requireFeatures(t, featureLCOWIntegrity, featureLCOW)
+	requireFeatures(t, featureLCOW, featureLCOWIntegrity)
 
 	client := newTestRuntimeClient(t)
 	ctx, cancel := context.WithCancel(context.Background())
@@ -85,7 +85,7 @@ func Test_LCOW_Layer_Integrity(t *testing.T) {
 
 			// Validate that verity target(s) present
 			output := shimDiagExecOutput(ctx, t, podID, []string{"ls", "-l", "/dev/mapper"})
-			filtered := filterStrings(strings.Split(output, "\n"), fmt.Sprintf("dm-verity-%s", scenario.layerType))
+			filtered := filterStrings(strings.Split(output, "\n"), fmt.Sprintf("verity-%s", scenario.layerType))
 			if len(filtered) == 0 {
 				t.Fatalf("expected verity targets for %s devices, none found.\n%s\n", scenario.layerType, output)
 			}

diff --git a/test/cri-containerd/policy_test.go b/test/cri-containerd/policy_test.go
@@ -92,7 +92,7 @@ func sandboxRequestWithPolicy(t *testing.T, policy string) *runtime.RunPodSandbo
 }
 
 func Test_RunPodSandbox_WithPolicy_Allowed(t *testing.T) {
-	requireFeatures(t, featureLCOW)
+	requireFeatures(t, featureLCOW, featureLCOWIntegrity)
 	pullRequiredLCOWImages(t, []string{imageLcowK8sPause})
 
 	sandboxPolicy := sandboxSecurityPolicy(t)
@@ -109,7 +109,7 @@ func Test_RunPodSandbox_WithPolicy_Allowed(t *testing.T) {
 }
 
 func Test_RunSimpleAlpineContainer_WithPolicy_Allowed(t *testing.T) {
-	requireFeatures(t, featureLCOW)
+	requireFeatures(t, featureLCOW, featureLCOWIntegrity)
 	pullRequiredLCOWImages(t, []string{imageLcowK8sPause, imageLcowAlpine})
 
 	alpinePolicy := alpineSecurityPolicy(t)
@@ -147,7 +147,7 @@ func Test_RunContainer_ValidContainerConfigs_Allowed(t *testing.T) {
 		opts []configOpt
 	}
 
-	requireFeatures(t, featureLCOW)
+	requireFeatures(t, featureLCOW, featureLCOWIntegrity)
 	pullRequiredLCOWImages(t, []string{imageLcowK8sPause, imageLcowAlpine})
 
 	client := newTestRuntimeClient(t)
@@ -214,7 +214,7 @@ func Test_RunContainer_InvalidContainerConfigs_NotAllowed(t *testing.T) {
 		expectedError string
 	}
 
-	requireFeatures(t, featureLCOW)
+	requireFeatures(t, featureLCOW, featureLCOWIntegrity)
 	pullRequiredLCOWImages(t, []string{imageLcowK8sPause, imageLcowAlpine})
 
 	alpinePolicy := alpineSecurityPolicy(t)