clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-05 05:01:28 +00:00
Code Issues Packages Projects Releases Wiki 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
parent 84b53c8d87 e65a7dabb9
commit 7daeecd42d
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_api_containers_test.go
+3 -3
View File
@@ -191,7 +191,7 @@ func (s *DockerSuite) TestContainerApiStartVolumeBinds(c *check.C) {
c.Assert(err, check.IsNil)
c.Assert(status, check.Equals, http.StatusCreated)
bindPath := randomTmpDirPath("test")
bindPath := randomTmpDirPath("test", daemonPlatform)
config = map[string]interface{}{
"Binds": []string{bindPath + ":/tmp"},
}
@@ -222,8 +222,8 @@ func (s *DockerSuite) TestContainerApiStartDupVolumeBinds(c *check.C) {
c.Assert(err, check.IsNil)
c.Assert(status, check.Equals, http.StatusCreated)
bindPath1 := randomTmpDirPath("test1")
bindPath2 := randomTmpDirPath("test2")
bindPath1 := randomTmpDirPath("test1", daemonPlatform)
bindPath2 := randomTmpDirPath("test2", daemonPlatform)
config = map[string]interface{}{
"Binds": []string{bindPath1 + ":/tmp", bindPath2 + ":/tmp"},
integration-cli/docker_cli_run_test.go
+3 -3
View File
@@ -322,8 +322,8 @@ func (s *DockerSuite) TestRunNoDupVolumes(c *check.C) {
// TODO Windows: This test cannot run on a Windows daemon as Windows does
// not support volumes
testRequires(c, DaemonIsLinux)
mountstr1 := randomTmpDirPath("test1") + ":/someplace"
mountstr2 := randomTmpDirPath("test2") + ":/someplace"
mountstr1 := randomTmpDirPath("test1", daemonPlatform) + ":/someplace"
mountstr2 := randomTmpDirPath("test2", daemonPlatform) + ":/someplace"
if out, _, err := dockerCmdWithError("run", "-v", mountstr1, "-v", mountstr2, "busybox", "true"); err == nil {
c.Fatal("Expected error about duplicate volume definitions")
@@ -2012,7 +2012,7 @@ func (s *DockerSuite) TestVolumesNoCopyData(c *check.C) {
c.Fatalf("Data was copied on volumes-from but shouldn't be:\n%q", out)
}
tmpDir := randomTmpDirPath("docker_test_bind_mount_copy_data")
tmpDir := randomTmpDirPath("docker_test_bind_mount_copy_data", daemonPlatform)
if out, _, err := dockerCmdWithError("run", "-v", tmpDir+":/foo", "dataimage", "ls", "-lh", "/foo/bar"); err == nil || !strings.Contains(out, "No such file or directory") {
c.Fatalf("Data was copied on bind-mount but shouldn't be:\n%q", out)
}
integration-cli/utils.go
+2 -2
View File
@@ -61,8 +61,8 @@ func listTar(f io.Reader) ([]string, error) {
return integration.ListTar(f)
}
func randomTmpDirPath(s string) string {
return integration.RandomTmpDirPath(s)
func randomTmpDirPath(s string, platform string) string {
return integration.RandomTmpDirPath(s, platform)
}
func consumeWithSpeed(reader io.Reader, chunkSize int, interval time.Duration, stop chan bool) (n int, err error) {