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

Fixes for dnephin review

Browse Source 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
Upstream-commit: 86f9eb4a085a61b3355dc38452c47def806bf7c9
Component: engine
This commit is contained in:
Christopher Crone
2017-09-14 19:27:09 +02:00
parent f23d5bec57
commit 4d643fb18a
16 changed files with 79 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/integration-cli/docker_cli_build_test.go
+2 -25
View File
@@ -368,8 +368,7 @@ ONBUILD ENTRYPOINT ["echo"]`))
}
func (s *DockerSuite) TestBuildCacheAdd(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, DaemonIsLinux, NotE2E) // Windows doesn't have httpserver image yet
testRequires(c, DaemonIsLinux) // Windows doesn't have httpserver image yet
name := "testbuildtwoimageswithadd"
server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{
"robots.txt": "hello",
@@ -389,9 +388,6 @@ func (s *DockerSuite) TestBuildCacheAdd(c *check.C) {
}
func (s *DockerSuite) TestBuildLastModified(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, NotE2E)
// Temporary fix for #30890. TODO @jhowardmsft figure out what
// has changed in the master busybox image.
testRequires(c, DaemonIsLinux)
@@ -521,8 +517,7 @@ RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio'
}
func (s *DockerSuite) TestBuildCopyAddMultipleFiles(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, DaemonIsLinux, NotE2E) // Linux specific test
testRequires(c, DaemonIsLinux) // Linux specific test
server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{
"robots.txt": "hello",
}))
@@ -637,9 +632,6 @@ RUN find "test6" "C:/test dir/test_file6"`
}
func (s *DockerSuite) TestBuildCopyWildcard(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, NotE2E)
name := "testcopywildcard"
server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{
"robots.txt": "hello",
@@ -1935,9 +1927,6 @@ func (s *DockerSuite) TestBuildAddCurrentDirWithoutCache(c *check.C) {
}
func (s *DockerSuite) TestBuildAddRemoteFileWithAndWithoutCache(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, NotE2E)
name := "testbuildaddremotefilewithcache"
server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{
"baz": "hello",
@@ -1963,9 +1952,6 @@ func (s *DockerSuite) TestBuildAddRemoteFileWithAndWithoutCache(c *check.C) {
}
func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, NotE2E)
name := "testbuildaddremotefilemtime"
name2 := name + "2"
name3 := name + "3"
@@ -2009,9 +1995,6 @@ func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) {
// FIXME(vdemeester) this really seems to test the same thing as before (combined)
func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithAndWithoutCache(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, NotE2E)
name := "testbuildaddlocalandremotefilewithcache"
server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{
"baz": "hello",
@@ -3112,9 +3095,6 @@ func (s *DockerSuite) TestBuildFromGitWithF(c *check.C) {
}
func (s *DockerSuite) TestBuildFromRemoteTarball(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, NotE2E)
name := "testbuildfromremotetarball"
buffer := new(bytes.Buffer)
@@ -3781,9 +3761,6 @@ func (s *DockerSuite) TestBuildFromMixedcaseDockerfile(c *check.C) {
}
func (s *DockerSuite) TestBuildFromURLWithF(c *check.C) {
// E2E: Requires built httpserver.
testRequires(c, NotE2E)
server := fakestorage.New(c, "", fakecontext.WithFiles(map[string]string{"baz": `FROM busybox
RUN echo from baz
COPY * /tmp/