Updating tests to use new est\internal package

Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>

test/cri-containerd/clone_test.go

@@ -14,7 +14,7 @@ import (
 
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	"github.com/Microsoft/hcsshim/test/internal/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
@@ -240,7 +240,7 @@ func cleanupContainer(t *testing.T, client runtime.RuntimeServiceClient, ctx con
 // cloned container from that template.
 func Test_CloneContainer_WCOW(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -265,7 +265,7 @@ func Test_CloneContainer_WCOW(t *testing.T) {
 // A test for creating multiple clones(3 clones) from one template container.
 func Test_MultiplClonedContainers_WCOW(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -302,7 +302,7 @@ func Test_MultiplClonedContainers_WCOW(t *testing.T) {
 // container.
 func Test_NormalContainerInClonedPod_WCOW(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -342,7 +342,7 @@ func Test_NormalContainerInClonedPod_WCOW(t *testing.T) {
 // of those pods.
 func Test_CloneContainersWithClonedPodPool_WCOW(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -390,7 +390,7 @@ func Test_CloneContainersWithClonedPodPool_WCOW(t *testing.T) {
 
 func Test_ClonedContainerRunningAfterDeletingTemplate(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -424,7 +424,7 @@ func Test_ClonedContainerRunningAfterDeletingTemplate(t *testing.T) {
 // can be made from each of them simultaneously.
 func Test_MultipleTemplateAndClones_WCOW(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@@ -467,7 +467,7 @@ func Test_MultipleTemplateAndClones_WCOW(t *testing.T) {
 // and verifies that the request correctly fails with an error.
 func Test_VerifyCloneAndTemplateConfig(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

test/cri-containerd/container_downlevel_test.go

@@ -7,13 +7,13 @@ import (
 	"testing"
 
 	"github.com/Microsoft/hcsshim/osversion"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	"github.com/Microsoft/hcsshim/test/internal/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
 func Test_CreateContainer_DownLevel_WCOW_Hypervisor(t *testing.T) {
 	requireFeatures(t, featureWCOWHypervisor)
-	testutilities.RequiresBuild(t, osversion.V19H1)
+	require.Build(t, osversion.V19H1)
 
 	pullRequiredImages(t, []string{imageWindowsNanoserver17763})
 

test/cri-containerd/container_layers_packing_test.go

@@ -11,7 +11,7 @@ import (
 
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	"github.com/Microsoft/hcsshim/test/internal/require"
 )
 
 const (
@@ -38,7 +38,7 @@ func validateTargets(ctx context.Context, t *testing.T, deviceNumber int, podID
 }
 
 func Test_Container_Layer_Packing_On_VPMem(t *testing.T) {
-	testutilities.RequiresBuild(t, osversion.V19H1)
+	require.Build(t, osversion.V19H1)
 
 	client := newTestRuntimeClient(t)
 	ctx, cancel := context.WithCancel(context.Background())
@@ -93,7 +93,7 @@ func Test_Container_Layer_Packing_On_VPMem(t *testing.T) {
 }
 
 func Test_Many_Container_Layers_Supported_On_VPMem(t *testing.T) {
-	testutilities.RequiresBuild(t, osversion.V19H1)
+	require.Build(t, osversion.V19H1)
 
 	client := newTestRuntimeClient(t)
 	ctx, cancel := context.WithCancel(context.Background())
@@ -124,7 +124,7 @@ func Test_Many_Container_Layers_Supported_On_VPMem(t *testing.T) {
 }
 
 func Test_Annotation_Disable_Multi_Mapping(t *testing.T) {
-	testutilities.RequiresBuild(t, osversion.V19H1)
+	require.Build(t, osversion.V19H1)
 
 	client := newTestRuntimeClient(t)
 	ctx, cancel := context.WithCancel(context.Background())

test/cri-containerd/container_update_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/Microsoft/hcsshim/internal/memory"
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	"github.com/Microsoft/hcsshim/test/internal/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
@@ -33,7 +33,7 @@ func calculateJobCPURate(hostProcs uint32, processorCount uint32) uint32 {
 }
 
 func Test_Container_UpdateResources_CPUShare(t *testing.T) {
-	testutilities.RequiresBuild(t, osversion.V20H2)
+	require.Build(t, osversion.V20H2)
 	type config struct {
 		name             string
 		requiredFeatures []string

test/cri-containerd/createcontainer_test.go

@@ -15,7 +15,7 @@ import (
 	"github.com/Microsoft/hcsshim/internal/memory"
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	"github.com/Microsoft/hcsshim/test/internal/require"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
 )
 
@@ -845,7 +845,7 @@ func Test_CreateContainer_CPUShares_LCOW(t *testing.T) {
 
 func Test_CreateContainer_Mount_File_LCOW(t *testing.T) {
 	requireFeatures(t, featureLCOW)
-	testutilities.RequiresBuild(t, osversion.V19H1)
+	require.Build(t, osversion.V19H1)
 
 	pullRequiredLCOWImages(t, []string{imageLcowK8sPause, imageLcowAlpine})
 
@@ -890,7 +890,7 @@ func Test_CreateContainer_Mount_File_LCOW(t *testing.T) {
 
 func Test_CreateContainer_Mount_ReadOnlyFile_LCOW(t *testing.T) {
 	requireFeatures(t, featureLCOW)
-	testutilities.RequiresBuild(t, osversion.V19H1)
+	require.Build(t, osversion.V19H1)
 
 	pullRequiredLCOWImages(t, []string{imageLcowK8sPause, imageLcowAlpine})
 

test/cri-containerd/main_test.go

@@ -14,8 +14,7 @@ import (
 	"time"
 
 	"github.com/Microsoft/hcsshim/osversion"
-	_ "github.com/Microsoft/hcsshim/test/functional/manifest"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	testutilities "github.com/Microsoft/hcsshim/test/internal"
 	"github.com/containerd/containerd"
 	eventtypes "github.com/containerd/containerd/api/events"
 	eventsapi "github.com/containerd/containerd/api/services/events/v1"
@@ -25,6 +24,8 @@ import (
 	"github.com/gogo/protobuf/types"
 	"google.golang.org/grpc"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
+
+	_ "github.com/Microsoft/hcsshim/test/internal/manifest"
 )
 
 const (

test/cri-containerd/runpodsandbox_test.go

@@ -22,7 +22,8 @@ import (
 	"github.com/Microsoft/hcsshim/internal/shimdiag"
 	"github.com/Microsoft/hcsshim/osversion"
 	"github.com/Microsoft/hcsshim/pkg/annotations"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	"github.com/Microsoft/hcsshim/test/internal/require"
+	testuvm "github.com/Microsoft/hcsshim/test/internal/uvm"
 	"github.com/containerd/containerd/log"
 	"golang.org/x/sys/windows"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
@@ -982,7 +983,7 @@ func Test_RunPodSandbox_Mount_SandboxDir_NoShare_WCOW(t *testing.T) {
 }
 
 func Test_RunPodSandbox_CPUGroup(t *testing.T) {
-	testutilities.RequiresBuild(t, osversion.V21H1)
+	require.Build(t, osversion.V21H1)
 	ctx := context.Background()
 	presentID := "FA22A12C-36B3-486D-A3E9-BC526C2B450B"
 
@@ -1062,7 +1063,7 @@ func createExt4VHD(ctx context.Context, t *testing.T, path string) {
 		log.L.Logger.SetOutput(io.Discard)
 		defer log.L.Logger.SetOutput(origLogOut)
 	}
-	uvm := testutilities.CreateLCOWUVM(ctx, t, t.Name()+"-createExt4VHD")
+	uvm := testuvm.CreateAndStartLCOW(ctx, t, t.Name()+"-createExt4VHD")
 	defer uvm.Close()
 
 	if err := lcow.CreateScratch(ctx, uvm, path, 2, ""); err != nil {

test/runhcs/e2e_matrix_test.go

@@ -19,7 +19,8 @@ import (
 	"github.com/Microsoft/go-winio/vhd"
 	"github.com/Microsoft/hcsshim/osversion"
 	runhcs "github.com/Microsoft/hcsshim/pkg/go-runhcs"
-	testutilities "github.com/Microsoft/hcsshim/test/functional/utilities"
+	"github.com/Microsoft/hcsshim/test/internal/layers"
+	"github.com/Microsoft/hcsshim/test/internal/require"
 	runc "github.com/containerd/go-runc"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/pkg/errors"
@@ -167,15 +168,15 @@ func testWindows(t *testing.T, version int, isolated bool) {
 	var err error
 
 	// Make the bundle
-	bundle := testutilities.CreateTempDir(t)
+	bundle := t.TempDir()
 	defer func() {
 		if err == nil {
 			os.RemoveAll(bundle)
 		} else {
 			t.Errorf("additional logs at bundle path: %v", bundle)
 		}
 	}()
-	scratch := testutilities.CreateTempDir(t)
+	scratch := t.TempDir()
 	defer func() {
 		vhd.DetachVhd(filepath.Join(scratch, "sandbox.vhdx"))
 		os.RemoveAll(scratch)
@@ -195,7 +196,7 @@ func testWindows(t *testing.T, version int, isolated bool) {
 
 	// Get the LayerFolders
 	imageName := getWindowsImageNameByVersion(t, version)
-	layers := testutilities.LayerFolders(t, imageName)
+	layers := layers.LayerFolders(t, imageName)
 	for _, layer := range layers {
 		g.AddWindowsLayerFolders(layer)
 	}
@@ -311,25 +312,25 @@ func testLCOWPod(t *testing.T) {
 }
 
 func Test_RS1_Argon(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS1)
+	require.ExactBuild(t, osversion.RS1)
 
 	testWindows(t, osversion.RS1, false)
 }
 
 func Test_RS1_Xenon(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS1)
+	require.ExactBuild(t, osversion.RS1)
 
 	testWindows(t, osversion.RS1, true)
 }
 
 func Test_RS3_Argon(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS3)
+	require.ExactBuild(t, osversion.RS3)
 
 	testWindows(t, osversion.RS3, false)
 }
 
 func Test_RS3_Xenon(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS3)
+	require.ExactBuild(t, osversion.RS3)
 
 	guests := []int{osversion.RS1, osversion.RS3}
 	for _, g := range guests {
@@ -338,13 +339,13 @@ func Test_RS3_Xenon(t *testing.T) {
 }
 
 func Test_RS4_Argon(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS4)
+	require.ExactBuild(t, osversion.RS4)
 
 	testWindows(t, osversion.RS4, false)
 }
 
 func Test_RS4_Xenon(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS4)
+	require.ExactBuild(t, osversion.RS4)
 
 	guests := []int{osversion.RS1, osversion.RS3, osversion.RS4}
 	for _, g := range guests {
@@ -353,19 +354,19 @@ func Test_RS4_Xenon(t *testing.T) {
 }
 
 func Test_RS5_Argon(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS5)
+	require.ExactBuild(t, osversion.RS5)
 
 	testWindows(t, osversion.RS5, false)
 }
 
 func Test_RS5_ArgonPods(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS5)
+	require.ExactBuild(t, osversion.RS5)
 
 	testWindowsPod(t, osversion.RS5, false)
 }
 
 func Test_RS5_UVMAndContainer(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS5)
+	require.ExactBuild(t, osversion.RS5)
 
 	guests := []int{osversion.RS1, osversion.RS3, osversion.RS4, osversion.RS5}
 	for _, g := range guests {
@@ -374,19 +375,19 @@ func Test_RS5_UVMAndContainer(t *testing.T) {
 }
 
 func Test_RS5_UVMPods(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS5)
+	require.ExactBuild(t, osversion.RS5)
 
 	testWindowsPod(t, osversion.RS5, true)
 }
 
 func Test_RS5_LCOW(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS5)
+	require.ExactBuild(t, osversion.RS5)
 
 	testLCOW(t)
 }
 
 func Test_RS5_LCOW_UVMPods(t *testing.T) {
-	testutilities.RequiresExactBuild(t, osversion.RS5)
+	require.ExactBuild(t, osversion.RS5)
 
 	testLCOWPod(t)
 }

test/runhcs/runhcs_test.go

@@ -4,5 +4,5 @@
 package runhcs
 
 import (
-	_ "github.com/Microsoft/hcsshim/test/functional/manifest"
+	_ "github.com/Microsoft/hcsshim/test/internal/manifest"
 )