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>
Upstream-commit: 1db927113f3e7af83fac548c0e2da05bccbd8d56
Component: engine
This commit is contained in:
Michal Minar
2015-01-06 16:48:10 +01:00
parent fa232dc1ae
commit eb6b6775f6
@@ -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) {