From 17b6583a5a352d5cf6d8ba20b018dc96f231f476 Mon Sep 17 00:00:00 2001 From: Srini Brahmaroutu Date: Thu, 26 Feb 2015 02:08:17 +0000 Subject: [PATCH] When --net=none enabled, the test uses local filesystem Closes #10963 Signed-off-by: Srini Brahmaroutu --- integration-cli/docker_cli_build_test.go | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_cli_build_test.go b/integration-cli/docker_cli_build_test.go index e37740adef..b28b69193f 100644 --- a/integration-cli/docker_cli_build_test.go +++ b/integration-cli/docker_cli_build_test.go @@ -770,16 +770,24 @@ RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' } func TestBuildCopyAddMultipleFiles(t *testing.T) { + server, err := fakeStorage(map[string]string{ + "robots.txt": "hello", + }) + if err != nil { + t.Fatal(err) + } + defer server.Close() + name := "testcopymultiplefilestofile" defer deleteImages(name) - ctx, err := fakeContext(`FROM busybox + ctx, err := fakeContext(fmt.Sprintf(`FROM busybox RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd RUN echo 'dockerio:x:1001:' >> /etc/group RUN mkdir /exists RUN touch /exists/exists_file RUN chown -R dockerio.dockerio /exists COPY test_file1 test_file2 /exists/ -ADD test_file3 test_file4 https://dockerproject.com/robots.txt /exists/ +ADD test_file3 test_file4 %s/robots.txt /exists/ RUN [ $(ls -l / | grep exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ] RUN [ $(ls -l /exists/test_file1 | awk '{print $3":"$4}') = 'root:root' ] RUN [ $(ls -l /exists/test_file2 | awk '{print $3":"$4}') = 'root:root' ] @@ -789,7 +797,7 @@ RUN [ $(ls -l /exists/test_file4 | awk '{print $3":"$4}') = 'root:root' ] RUN [ $(ls -l /exists/robots.txt | awk '{print $3":"$4}') = 'root:root' ] RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' ] -`, +`, server.URL), map[string]string{ "test_file1": "test1", "test_file2": "test2",