1. docker
  2. Commit 088c3eeea8ae6e46bf698d0c99c98b92bc894063
Browse code

Windows: Enable some cp integration tests

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2016/08/31 06:32:10
Showing 3 changed files
integration-cli/docker_cli_cp_from_container_test.go
History View file @ 088c3ee
... ... 
@@ -24,7 +24,6 @@ import (
24 24
25 25 
 // Test for error when SRC does not exist.
26 26 
 func (s *DockerSuite) TestCpFromErrSrcNotExists(c *check.C) {
27 
-	testRequires(c, DaemonIsLinux)
28 27 
 	containerID := makeTestContainer(c, testContainerOptions{})
29 28
30 29 
 	tmpDir := getTestDir(c, "test-cp-from-err-src-not-exists")
integration-cli/docker_cli_cp_test.go
History View file @ 088c3ee
... ... 
@@ -36,7 +36,6 @@ func (s *DockerSuite) TestCpLocalOnly(c *check.C) {
36 36 
 // Test for #5656
37 37 
 // Check that garbage paths don't escape the container's rootfs
38 38 
 func (s *DockerSuite) TestCpGarbagePath(c *check.C) {
39 
-	testRequires(c, DaemonIsLinux)
40 39 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath)
41 40
42 41 
 	containerID := strings.TrimSpace(out)
... ... 
@@ -79,7 +78,6 @@ func (s *DockerSuite) TestCpGarbagePath(c *check.C) {
79 79
80 80 
 // Check that relative paths are relative to the container's rootfs
81 81 
 func (s *DockerSuite) TestCpRelativePath(c *check.C) {
82 
-	testRequires(c, DaemonIsLinux)
83 82 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath)
84 83
85 84 
 	containerID := strings.TrimSpace(out)
... ... 
@@ -128,7 +126,6 @@ func (s *DockerSuite) TestCpRelativePath(c *check.C) {
128 128
129 129 
 // Check that absolute paths are relative to the container's rootfs
130 130 
 func (s *DockerSuite) TestCpAbsolutePath(c *check.C) {
131 
-	testRequires(c, DaemonIsLinux)
132 131 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath)
133 132
134 133 
 	containerID := strings.TrimSpace(out)
... ... 
@@ -519,7 +516,6 @@ func (s *DockerSuite) TestCpVolumePath(c *check.C) {
519 519 
 }
520 520
521 521 
 func (s *DockerSuite) TestCpToDot(c *check.C) {
522 
-	testRequires(c, DaemonIsLinux)
523 522 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo lololol > /test")
524 523
525 524 
 	containerID := strings.TrimSpace(out)
... ... 
@@ -541,7 +537,6 @@ func (s *DockerSuite) TestCpToDot(c *check.C) {
541 541 
 }
542 542
543 543 
 func (s *DockerSuite) TestCpToStdout(c *check.C) {
544 
-	testRequires(c, DaemonIsLinux)
545 544 
 	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo lololol > /test")
546 545
547 546 
 	containerID := strings.TrimSpace(out)
integration-cli/docker_cli_cp_to_container_test.go
History View file @ 088c3ee
... ... 
@@ -23,7 +23,6 @@ import (
23 23
24 24 
 // Test for error when SRC does not exist.
25 25 
 func (s *DockerSuite) TestCpToErrSrcNotExists(c *check.C) {
26 
-	testRequires(c, DaemonIsLinux)
27 26 
 	containerID := makeTestContainer(c, testContainerOptions{})
28 27
29 28 
 	tmpDir := getTestDir(c, "test-cp-to-err-src-not-exists")
... ... 
@@ -41,7 +40,6 @@ func (s *DockerSuite) TestCpToErrSrcNotExists(c *check.C) {
41 41 
 // Test for error when SRC ends in a trailing
42 42 
 // path separator but it exists as a file.
43 43 
 func (s *DockerSuite) TestCpToErrSrcNotDir(c *check.C) {
44 
-	testRequires(c, DaemonIsLinux)
45 44 
 	containerID := makeTestContainer(c, testContainerOptions{})
46 45
47 46 
 	tmpDir := getTestDir(c, "test-cp-to-err-src-not-dir")
... ... 
@@ -227,7 +225,6 @@ func (s *DockerSuite) TestCpToSymlinkDestination(c *check.C) {
227 227 
 //    exist. This should create a file with the name DST and copy the
228 228 
 //    contents of the source file into it.
229 229 
 func (s *DockerSuite) TestCpToCaseA(c *check.C) {
230 
-	testRequires(c, DaemonIsLinux)
231 230 
 	containerID := makeTestContainer(c, testContainerOptions{
232 231 
 		workDir: "/root", command: makeCatFileCommand("itWorks.txt"),
233 232 
 	})
... ... 
@@ -249,7 +246,6 @@ func (s *DockerSuite) TestCpToCaseA(c *check.C) {
249 249 
 //    exist. This should cause an error because the copy operation cannot
250 250 
 //    create a directory when copying a single file.
251 251 
 func (s *DockerSuite) TestCpToCaseB(c *check.C) {
252 
-	testRequires(c, DaemonIsLinux)
253 252 
 	containerID := makeTestContainer(c, testContainerOptions{
254 253 
 		command: makeCatFileCommand("testDir/file1"),
255 254 
 	})
... ... 
@@ -344,7 +340,6 @@ func (s *DockerSuite) TestCpToCaseD(c *check.C) {
344 344 
 //    directory. Ensure this works whether DST has a trailing path separator or
345 345 
 //    not.
346 346 
 func (s *DockerSuite) TestCpToCaseE(c *check.C) {
347 
-	testRequires(c, DaemonIsLinux)
348 347 
 	containerID := makeTestContainer(c, testContainerOptions{
349 348 
 		command: makeCatFileCommand("/testDir/file1-1"),
350 349 
 	})
... ... 
@@ -449,7 +444,6 @@ func (s *DockerSuite) TestCpToCaseG(c *check.C) {
449 449 
 //    directory (but not the directory itself) into the DST directory. Ensure
450 450 
 //    this works whether DST has a trailing path separator or not.
451 451 
 func (s *DockerSuite) TestCpToCaseH(c *check.C) {
452 
-	testRequires(c, DaemonIsLinux)
453 452 
 	containerID := makeTestContainer(c, testContainerOptions{
454 453 
 		command: makeCatFileCommand("/testDir/file1-1"),
455 454 
 	})