mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Skip TestBuildNotVerboseFailure if no network
TestBuildNotVerboseFailure use a non-exist image busybox1, it requires network connection to access to Dockerhub, skip this test if there is no network. Signed-off-by: Lei Jitang <leijitang@huawei.com>
This commit is contained in:
parent
8a0d2d8e57
commit
9ab0aa4336
1 changed files with 17 additions and 1 deletions
|
@ -4879,6 +4879,23 @@ func (s *DockerSuite) TestBuildNotVerboseSuccess(c *check.C) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (s *DockerSuite) TestBuildNotVerboseFailureWithNonExistImage(c *check.C) {
|
||||||
|
// This test makes sure that -q works correctly when build fails by
|
||||||
|
// comparing between the stderr output in quiet mode and in stdout
|
||||||
|
// and stderr output in verbose mode
|
||||||
|
testRequires(c, Network)
|
||||||
|
testName := "quiet_build_not_exists_image"
|
||||||
|
buildCmd := "FROM busybox11"
|
||||||
|
_, _, qstderr, qerr := buildImageWithStdoutStderr(testName, buildCmd, false, "-q", "--force-rm", "--rm")
|
||||||
|
_, vstdout, vstderr, verr := buildImageWithStdoutStderr(testName, buildCmd, false, "--force-rm", "--rm")
|
||||||
|
if verr == nil || qerr == nil {
|
||||||
|
c.Fatal(fmt.Errorf("Test [%s] expected to fail but didn't", testName))
|
||||||
|
}
|
||||||
|
if qstderr != vstdout+vstderr {
|
||||||
|
c.Fatal(fmt.Errorf("Test[%s] expected that quiet stderr and verbose stdout are equal; quiet [%v], verbose [%v]", testName, qstderr, vstdout+vstderr))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func (s *DockerSuite) TestBuildNotVerboseFailure(c *check.C) {
|
func (s *DockerSuite) TestBuildNotVerboseFailure(c *check.C) {
|
||||||
// This test makes sure that -q works correctly when build fails by
|
// This test makes sure that -q works correctly when build fails by
|
||||||
// comparing between the stderr output in quiet mode and in stdout
|
// comparing between the stderr output in quiet mode and in stdout
|
||||||
|
@ -4889,7 +4906,6 @@ func (s *DockerSuite) TestBuildNotVerboseFailure(c *check.C) {
|
||||||
}{
|
}{
|
||||||
{"quiet_build_no_from_at_the_beginning", "RUN whoami"},
|
{"quiet_build_no_from_at_the_beginning", "RUN whoami"},
|
||||||
{"quiet_build_unknown_instr", "FROMD busybox"},
|
{"quiet_build_unknown_instr", "FROMD busybox"},
|
||||||
{"quiet_build_not_exists_image", "FROM busybox11"},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, te := range tt {
|
for _, te := range tt {
|
||||||
|
|
Loading…
Reference in a new issue