clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 05:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes 16556 CI failures

Browse Source 
Signed-off-by: John Howard <jhoward@microsoft.com>
This commit is contained in:
John Howard
2015-09-24 11:19:00 -07:00
parent de8b5c46cc
commit e65a7dabb9
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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")
@@ -2015,7 +2015,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)
}