소스 검색

Merge pull request #21685 from runcom/int-fix-tiny

integration-cli: add info to fatal log
David Calavera 9 년 전
부모
커밋
61ca308676
1개의 변경된 파일3개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 3
      integration-cli/docker_cli_run_test.go

+ 3 - 3
integration-cli/docker_cli_run_test.go

@@ -813,7 +813,7 @@ func (s *DockerSuite) TestRunEnvironment(c *check.C) {
 	}
 	}
 	sort.Strings(goodEnv)
 	sort.Strings(goodEnv)
 	if len(goodEnv) != len(actualEnv) {
 	if len(goodEnv) != len(actualEnv) {
-		c.Fatalf("Wrong environment: should be %d variables, not: %q\n", len(goodEnv), strings.Join(actualEnv, ", "))
+		c.Fatalf("Wrong environment: should be %d variables, not %d: %q", len(goodEnv), len(actualEnv), strings.Join(actualEnv, ", "))
 	}
 	}
 	for i := range goodEnv {
 	for i := range goodEnv {
 		if actualEnv[i] != goodEnv[i] {
 		if actualEnv[i] != goodEnv[i] {
@@ -848,7 +848,7 @@ func (s *DockerSuite) TestRunEnvironmentErase(c *check.C) {
 	}
 	}
 	sort.Strings(goodEnv)
 	sort.Strings(goodEnv)
 	if len(goodEnv) != len(actualEnv) {
 	if len(goodEnv) != len(actualEnv) {
-		c.Fatalf("Wrong environment: should be %d variables, not: %q\n", len(goodEnv), strings.Join(actualEnv, ", "))
+		c.Fatalf("Wrong environment: should be %d variables, not %d: %q", len(goodEnv), len(actualEnv), strings.Join(actualEnv, ", "))
 	}
 	}
 	for i := range goodEnv {
 	for i := range goodEnv {
 		if actualEnv[i] != goodEnv[i] {
 		if actualEnv[i] != goodEnv[i] {
@@ -883,7 +883,7 @@ func (s *DockerSuite) TestRunEnvironmentOverride(c *check.C) {
 	}
 	}
 	sort.Strings(goodEnv)
 	sort.Strings(goodEnv)
 	if len(goodEnv) != len(actualEnv) {
 	if len(goodEnv) != len(actualEnv) {
-		c.Fatalf("Wrong environment: should be %d variables, not: %q\n", len(goodEnv), strings.Join(actualEnv, ", "))
+		c.Fatalf("Wrong environment: should be %d variables, not %d: %q", len(goodEnv), len(actualEnv), strings.Join(actualEnv, ", "))
 	}
 	}
 	for i := range goodEnv {
 	for i := range goodEnv {
 		if actualEnv[i] != goodEnv[i] {
 		if actualEnv[i] != goodEnv[i] {