vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #16559 from Microsoft/10662-fix16556

Browse source 
Fixes 16556 CI failures
This commit is contained in:
Jess Frazelle 2015-09-24 12:31:36 -07:00
commit ce0cf62ce0
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
integration/utils.go
View file

@ -11,7 +11,6 @@ import (
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"reflect" "reflect"
"runtime"
"strings" "strings"
"syscall" "syscall"
"time" "time"
@ -247,12 +246,16 @@ func ListTar(f io.Reader) ([]string, error) {
// RandomTmpDirPath provides a temporary path with rand string appended. // RandomTmpDirPath provides a temporary path with rand string appended.
// does not create or checks if it exists. // does not create or checks if it exists.
func RandomTmpDirPath(s string) string { func RandomTmpDirPath(s string, platform string) string {
tmp := "/tmp" tmp := "/tmp"
if runtime.GOOS == "windows" { if platform == "windows" {
tmp = os.Getenv("TEMP") 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. // ConsumeWithSpeed reads chunkSize bytes from reader after every interval.

2
integration/utils_test.go
View file

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