From 5b78a9a8f1390d9efa7510473b968aa6d363de21 Mon Sep 17 00:00:00 2001
From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
Date: Thu, 3 Mar 2022 04:55:22 +1100
Subject: [PATCH] Remove hardcoded /tmp in tempfile paths

There's no specific need mentioned at the points it was added, and it
makes the Windows-hosted test run setup slightly weird.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
---
 .github/workflows/windows-periodic.yml | 1 -
 integration/addition_gids_test.go      | 2 +-
 integration/container_log_test.go      | 4 ++--
 integration/pod_dualstack_test.go      | 2 +-
 integration/pod_hostname_test.go       | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/windows-periodic.yml b/.github/workflows/windows-periodic.yml
index af872a2d6..d5084ed41 100644
--- a/.github/workflows/windows-periodic.yml
+++ b/.github/workflows/windows-periodic.yml
@@ -183,7 +183,6 @@ jobs:
            ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "sh.exe -s" <<EOF
              cd c:/containerd
              ./script/setup/install-cni-windows
-             mkdir /c/tmp
              export TEST_IMAGE_LIST=c:/repolist.toml
              make cri-integration | tee c:/Logs/cri-integration.log
            EOF
diff --git a/integration/addition_gids_test.go b/integration/addition_gids_test.go
index c196f749a..6f8a1c73f 100644
--- a/integration/addition_gids_test.go
+++ b/integration/addition_gids_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestAdditionalGids(t *testing.T) {
-	testPodLogDir, err := os.MkdirTemp("/tmp", "additional-gids")
+	testPodLogDir, err := os.MkdirTemp("", "additional-gids")
 	require.NoError(t, err)
 	defer os.RemoveAll(testPodLogDir)
 
diff --git a/integration/container_log_test.go b/integration/container_log_test.go
index cd8b4dc6f..bd866d311 100644
--- a/integration/container_log_test.go
+++ b/integration/container_log_test.go
@@ -30,7 +30,7 @@ import (
 )
 
 func TestContainerLogWithoutTailingNewLine(t *testing.T) {
-	testPodLogDir, err := os.MkdirTemp("/tmp", "container-log-without-tailing-newline")
+	testPodLogDir, err := os.MkdirTemp("", "container-log-without-tailing-newline")
 	require.NoError(t, err)
 	defer os.RemoveAll(testPodLogDir)
 
@@ -80,7 +80,7 @@ func TestContainerLogWithoutTailingNewLine(t *testing.T) {
 }
 
 func TestLongContainerLog(t *testing.T) {
-	testPodLogDir, err := os.MkdirTemp("/tmp", "long-container-log")
+	testPodLogDir, err := os.MkdirTemp("", "long-container-log")
 	require.NoError(t, err)
 	defer os.RemoveAll(testPodLogDir)
 
diff --git a/integration/pod_dualstack_test.go b/integration/pod_dualstack_test.go
index 63e47871c..24bd0a2de 100644
--- a/integration/pod_dualstack_test.go
+++ b/integration/pod_dualstack_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 func TestPodDualStack(t *testing.T) {
-	testPodLogDir, err := os.MkdirTemp("/tmp", "dualstack")
+	testPodLogDir, err := os.MkdirTemp("", "dualstack")
 	require.NoError(t, err)
 	defer os.RemoveAll(testPodLogDir)
 
diff --git a/integration/pod_hostname_test.go b/integration/pod_hostname_test.go
index 28028f1b6..9ef9c367e 100644
--- a/integration/pod_hostname_test.go
+++ b/integration/pod_hostname_test.go
@@ -64,7 +64,7 @@ func TestPodHostname(t *testing.T) {
 			if test.needsHostNetwork && goruntime.GOOS == "windows" {
 				t.Skip("Skipped on Windows.")
 			}
-			testPodLogDir, err := os.MkdirTemp("/tmp", "hostname")
+			testPodLogDir, err := os.MkdirTemp("", "hostname")
 			require.NoError(t, err)
 			defer os.RemoveAll(testPodLogDir)