toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13587 from rhatdan/volume-tmpfs

Browse Source 
Add tmpfs as a valid volume source command.
Upstream-commit: d4be46def4660f2dea090646f8d768f38c6fd520
Component: engine
This commit is contained in:
David Calavera
2015-12-02 11:16:49 -08:00
parent e9b5c8b47b 71b21cf347
commit 9a973af9b7
24 changed files with 248 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/engine/integration-cli/docker_cli_run_test.go
View File

@ -375,10 +375,10 @@ func (s *DockerSuite) TestRunNoDupVolumes(c *check.C) {
mountstr2 := path2 + someplace
if out, _, err := dockerCmdWithError("run", "-v", mountstr1, "-v", mountstr2, "busybox", "true"); err == nil {
c.Fatal("Expected error about duplicate volume definitions")
c.Fatal("Expected error about duplicate mount definitions")
} else {
if !strings.Contains(out, "Duplicate bind mount") {
c.Fatalf("Expected 'duplicate volume' error, got %v", out)
if !strings.Contains(out, "Duplicate mount point") {
c.Fatalf("Expected 'duplicate mount point' error, got %v", out)
}
}
}