Skip to content

Commit 24b2f5b

Browse files
committed
Fix CRI test on windows.
Signed-off-by: Lantao Liu <[email protected]>
1 parent 8c8c91c commit 24b2f5b

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

cmd/critest/cri_test.go

+12-3
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ package main
1919
import (
2020
"flag"
2121
"fmt"
22+
"io/ioutil"
2223
"math/rand"
2324
"os"
2425
"os/exec"
2526
"path"
27+
"path/filepath"
2628
"strings"
2729
"testing"
2830
"time"
@@ -73,13 +75,17 @@ func runTestSuite(t *testing.T) {
7375
ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "CRI validation", reporter)
7476
}
7577

76-
func generateTempTestName() string {
78+
func generateTempTestName() (string, error) {
7779
suffix := make([]byte, 10)
7880
for i := range suffix {
7981
suffix[i] = letterBytes[rand.Intn(len(letterBytes))]
8082
}
8183

82-
return "/tmp/critest-" + string(suffix) + ".test"
84+
dir, err := ioutil.TempDir("", "cri-test")
85+
if err != nil {
86+
return "", err
87+
}
88+
return filepath.Join(dir, "critest-"+string(suffix)+".test"), nil
8389
}
8490

8591
func runParallelTestSuite(t *testing.T) {
@@ -88,7 +94,10 @@ func runParallelTestSuite(t *testing.T) {
8894
t.Fatalf("Failed to lookup path of critest: %v", err)
8995
}
9096

91-
tempFileName := generateTempTestName()
97+
tempFileName, err := generateTempTestName()
98+
if err != nil {
99+
t.Fatalf("Failed to generate temp test name: %v", err)
100+
}
92101
err = os.Symlink(criPath, tempFileName)
93102
if err != nil {
94103
t.Fatalf("Failed to lookup path of critest: %v", err)

pkg/validate/consts.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ var (
5050
// Windows defaults
5151
echoHelloWindowsCmd = []string{"powershell", "-c", "echo hello"}
5252
sleepWindowsCmd = []string{"powershell", "-c", "sleep", "4321"}
53-
checkSleepWindowsCmd = []string{"powershell", "-c", "tasklist powershell | findstr sleep"}
53+
checkSleepWindowsCmd = []string{"powershell", "-c", "tasklist | findstr sleep; exit 0"}
5454
shellWindowsCmd = []string{"cmd", "/Q"}
5555
pauseWindowsCmd = []string{"powershell", "-c", "ping -t localhost"}
5656
logDefaultWindowsCmd = []string{"powershell", "-c", "echo '" + defaultLog + "'"}

0 commit comments

Comments
 (0)