Fix temp dir creation

Signed-off-by: Gabriel Adrian Samfira <[email protected]>
microsoft · Jan 31, 2023 · 0f2ae9b · 0f2ae9b
1 parent 2b4816b
commit 0f2ae9b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 9 deletions.
diff --git a/internal/winapi/zsyscall_windows.go b/internal/winapi/zsyscall_windows.go
diff --git a/test/functional/uvm_mem_backingtype_test.go b/test/functional/uvm_mem_backingtype_test.go
@@ -7,6 +7,7 @@ package functional
 import (
 	"context"
 	"io"
+	"os"
 	"testing"
 
 	"github.com/Microsoft/hcsshim/internal/uvm"

diff --git a/test/functional/uvm_memory_test.go b/test/functional/uvm_memory_test.go
@@ -4,6 +4,7 @@ package functional
 
 import (
 	"context"
+	"os"
 	"testing"
 	"time"
 

diff --git a/test/functional/uvm_properties_test.go b/test/functional/uvm_properties_test.go
@@ -6,6 +6,7 @@ package functional
 
 import (
 	"context"
+	"os"
 	"testing"
 
 	"github.com/Microsoft/hcsshim/osversion"

diff --git a/test/functional/uvm_scsi_test.go b/test/functional/uvm_scsi_test.go
@@ -51,7 +51,6 @@ func TestSCSIAddRemoveWCOW(t *testing.T) {
 	u, layers, uvmScratchDir := tuvm.CreateWCOWUVM(context.Background(), t, t.Name(), "mcr.microsoft.com/windows/nanoserver:1903")
 	defer os.RemoveAll(uvmScratchDir)
 	defer u.Close()
-	layers := testutilities.CreateWCOWBlankBaseLayer(context.Background(), t)
 	defer os.RemoveAll(layers[0])
 
 	testSCSIAddRemoveSingle(t, u, `c:\`, "windows", layers)

diff --git a/test/functional/uvm_vsmb_test.go b/test/functional/uvm_vsmb_test.go
@@ -7,6 +7,7 @@ package functional
 import (
 	"context"
 	"errors"
+	"os"
 	"testing"
 
 	"github.com/Microsoft/hcsshim/internal/hcs"

diff --git a/test/internal/scratch.go b/test/internal/scratch.go
@@ -32,7 +32,7 @@ func init() {
 // can be used as the base of a WCOW RW layer when it's not going to be the container's
 // scratch mount.
 func CreateWCOWBlankBaseLayer(ctx context.Context, t *testing.T) []string {
-	tempDir := CreateTempDir(t)
+	tempDir := t.TempDir()
 	if err := wclayer.ConvertToBaseLayer(context.Background(), tempDir); err != nil {
 		t.Fatalf("Failed ConvertToBaseLayer: %s", err)
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ package functional @@
     import (
     	"context"
+    	"os"
     	"testing"
     	"time"
@@ Expand Down @@