Merge pull request #10794 from ahmetalpbalkan/win-cli/TestContainerApi-volume-path-fix

integration-cli: Generate unix-style volume paths for tests

integration-cli/docker_api_containers_test.go

@@ -4,8 +4,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"io/ioutil"
-	"os"
 	"os/exec"
 	"strings"
 	"testing"
@@ -138,11 +136,7 @@ func TestContainerApiStartVolumeBinds(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	bindPath, err := ioutil.TempDir(os.TempDir(), "test")
+	bindPath := randomUnixTmpDirPath("test")
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	config = map[string]interface{}{
 		"Binds": []string{bindPath + ":/tmp"},
 	}
@@ -175,16 +169,8 @@ func TestContainerApiStartDupVolumeBinds(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	bindPath1, err := ioutil.TempDir("", "test1")
+	bindPath1 := randomUnixTmpDirPath("test1")
-	if err != nil {
+	bindPath2 := randomUnixTmpDirPath("test2")
-		t.Fatal(err)
-	}
-	defer os.Remove(bindPath1)
-	bindPath2, err := ioutil.TempDir("", "test2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(bindPath2)
 
 	config = map[string]interface{}{
 		"Binds": []string{bindPath1 + ":/tmp", bindPath2 + ":/tmp"},
@@ -262,11 +248,7 @@ func TestVolumesFromHasPriority(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	bindPath, err := ioutil.TempDir(os.TempDir(), "test")
+	bindPath := randomUnixTmpDirPath("test")
-	if err != nil {
-		t.Fatal(err)
-	}
-
 	config = map[string]interface{}{
 		"VolumesFrom": []string{volName},
 		"Binds":       []string{bindPath + ":/tmp"},

integration-cli/utils.go

@@ -11,6 +11,7 @@ import (
 	"net/http/httptest"
 	"os"
 	"os/exec"
+	"path"
 	"reflect"
 	"strings"
 	"syscall"
@@ -277,6 +278,12 @@ func makeRandomString(n int) string {
 	return string(b)
 }
 
+// randomUnixTmpDirPath provides a temporary unix path with rand string appended.
+// does not create or checks if it exists.
+func randomUnixTmpDirPath(s string) string {
+	return path.Join("/tmp", fmt.Sprintf("%s.%s", s, makeRandomString(10)))
+}
+
 // Reads chunkSize bytes from reader after every interval.
 // Returns total read bytes.
 func consumeWithSpeed(reader io.Reader, chunkSize int, interval time.Duration, stop chan bool) (n int, err error) {