1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #11268 from duglin/FixServerURLUsage

Use server.URL() instead of server.URL
This commit is contained in:
Michael Crosby 2015-03-09 17:18:32 -07:00
commit c5af44e6d0

View file

@ -686,7 +686,7 @@ func TestBuildLastModified(t *testing.T) {
ADD %s/file / ADD %s/file /
RUN ls -le /file` RUN ls -le /file`
dockerfile := fmt.Sprintf(dFmt, server.URL) dockerfile := fmt.Sprintf(dFmt, server.URL())
if _, out, err = buildImageWithOut(name, dockerfile, false); err != nil { if _, out, err = buildImageWithOut(name, dockerfile, false); err != nil {
t.Fatal(err) t.Fatal(err)
@ -721,7 +721,7 @@ RUN ls -le /file`
} }
defer server.Close() defer server.Close()
dockerfile = fmt.Sprintf(dFmt, server.URL) dockerfile = fmt.Sprintf(dFmt, server.URL())
if _, out2, err = buildImageWithOut(name, dockerfile, false); err != nil { if _, out2, err = buildImageWithOut(name, dockerfile, false); err != nil {
t.Fatal(err) t.Fatal(err)