Fixes 16556 CI failures

Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard 2015-09-24 10:53:47 -07:00
parent b5e2a90aa3
commit ec75a8049c
2 changed files with 8 additions and 5 deletions

View file

@ -11,7 +11,6 @@ import (
"os/exec"
"path/filepath"
"reflect"
"runtime"
"strings"
"syscall"
"time"
@ -247,12 +246,16 @@ func ListTar(f io.Reader) ([]string, error) {
// RandomTmpDirPath provides a temporary path with rand string appended.
// does not create or checks if it exists.
func RandomTmpDirPath(s string) string {
func RandomTmpDirPath(s string, platform string) string {
tmp := "/tmp"
if runtime.GOOS == "windows" {
if platform == "windows" {
tmp = os.Getenv("TEMP")
}
return filepath.Join(tmp, fmt.Sprintf("%s.%s", s, stringutils.GenerateRandomAlphaOnlyString(10)))
path := filepath.Join(tmp, fmt.Sprintf("%s.%s", s, stringutils.GenerateRandomAlphaOnlyString(10)))
if platform == "windows" {
return filepath.FromSlash(path) // Using \
}
return filepath.ToSlash(path) // Using /
}
// ConsumeWithSpeed reads chunkSize bytes from reader after every interval.

View file

@ -343,7 +343,7 @@ func TestListTar(t *testing.T) {
}
func TestRandomTmpDirPath(t *testing.T) {
path := RandomTmpDirPath("something")
path := RandomTmpDirPath("something", runtime.GOOS)
prefix := "/tmp/something"
if runtime.GOOS == "windows" {