github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove hardcoded /tmp in tempfile paths

Browse Source 
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>
This commit is contained in:
Paul "TBBle" Hampson 2022-03-03 04:55:22 +11:00
parent 5427aec4f1
commit 5b78a9a8f1
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/windows-periodic.yml vendored
View File

@ -183,7 +183,6 @@ jobs:
ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "sh.exe -s" <<EOF ssh -i $HOME/.ssh/id_rsa ${{ env.SSH_OPTS }} azureuser@${{ env.VM_PUB_IP }} "sh.exe -s" <<EOF
cd c:/containerd cd c:/containerd
./script/setup/install-cni-windows ./script/setup/install-cni-windows
mkdir /c/tmp
export TEST_IMAGE_LIST=c:/repolist.toml export TEST_IMAGE_LIST=c:/repolist.toml
make cri-integration | tee c:/Logs/cri-integration.log make cri-integration | tee c:/Logs/cri-integration.log
EOF EOF

2
integration/addition_gids_test.go
View File

@ -31,7 +31,7 @@ import (
) )
func TestAdditionalGids(t *testing.T) { func TestAdditionalGids(t *testing.T) {
testPodLogDir, err := os.MkdirTemp("/tmp", "additional-gids") testPodLogDir, err := os.MkdirTemp("", "additional-gids")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(testPodLogDir) defer os.RemoveAll(testPodLogDir)

4
integration/container_log_test.go
View File

@ -30,7 +30,7 @@ import (
) )
func TestContainerLogWithoutTailingNewLine(t *testing.T) { 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) require.NoError(t, err)
defer os.RemoveAll(testPodLogDir) defer os.RemoveAll(testPodLogDir)
@ -80,7 +80,7 @@ func TestContainerLogWithoutTailingNewLine(t *testing.T) {
} }
func TestLongContainerLog(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) require.NoError(t, err)
defer os.RemoveAll(testPodLogDir) defer os.RemoveAll(testPodLogDir)

2
integration/pod_dualstack_test.go
View File

@ -31,7 +31,7 @@ import (
) )
func TestPodDualStack(t *testing.T) { func TestPodDualStack(t *testing.T) {
testPodLogDir, err := os.MkdirTemp("/tmp", "dualstack") testPodLogDir, err := os.MkdirTemp("", "dualstack")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(testPodLogDir) defer os.RemoveAll(testPodLogDir)

2
integration/pod_hostname_test.go
View File

@ -64,7 +64,7 @@ func TestPodHostname(t *testing.T) {
if test.needsHostNetwork && goruntime.GOOS == "windows" { if test.needsHostNetwork && goruntime.GOOS == "windows" {
t.Skip("Skipped on Windows.") t.Skip("Skipped on Windows.")
} }
testPodLogDir, err := os.MkdirTemp("/tmp", "hostname") testPodLogDir, err := os.MkdirTemp("", "hostname")
require.NoError(t, err) require.NoError(t, err)
defer os.RemoveAll(testPodLogDir) defer os.RemoveAll(testPodLogDir)