Pārlūkot izejas kodu

Amended TestExecParseError test

Usage string isn't printed anymore. User is adviced to see help instead
- according to coreutils standard.

Signed-off-by: Michal Minar <miminar@redhat.com>
Michal Minar 10 gadi atpakaļ
vecāks
revīzija
1db927113f
1 mainītis faili ar 3 papildinājumiem un 3 dzēšanām
  1. 3 3
      integration-cli/docker_cli_exec_test.go

+ 3 - 3
integration-cli/docker_cli_exec_test.go

@@ -362,10 +362,10 @@ func TestExecParseError(t *testing.T) {
 
 	// Test normal (non-detached) case first
 	cmd := exec.Command(dockerBinary, "exec", "top")
-	if out, _, err := runCommandWithOutput(cmd); err == nil || !strings.Contains(out, "Usage:") {
-		t.Fatalf("Should have thrown error & given usage: %s", out)
+	if _, stderr, code, err := runCommandWithStdoutStderr(cmd); err == nil || !strings.Contains(stderr, "See '"+dockerBinary+" exec --help'") || code == 0 {
+		t.Fatalf("Should have thrown error & point to help: %s", stderr)
 	}
-	logDone("exec - error on parseExec should return usage")
+	logDone("exec - error on parseExec should point to help")
 }
 
 func TestExecStopNotHanging(t *testing.T) {