From 660ec32e8fbaf62c6ae9254377495a0674d858d6 Mon Sep 17 00:00:00 2001
From: lixiaobing10051267
Date: Tue, 21 Feb 2017 17:41:45 +0800
Subject: [PATCH] invalide detach keys provided Signed-off-by:
lixiaobing10051267
---
daemon/attach.go | 2 +-
integration-cli/docker_cli_run_unix_test.go | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/daemon/attach.go b/daemon/attach.go
index 1cc8adb17b..e262ed2912 100644
--- a/daemon/attach.go
+++ b/daemon/attach.go
@@ -22,7 +22,7 @@ func (daemon *Daemon) ContainerAttach(prefixOrName string, c *backend.ContainerA
if c.DetachKeys != "" {
keys, err = term.ToBytes(c.DetachKeys)
if err != nil {
- return fmt.Errorf("Invalid escape keys (%s) provided", c.DetachKeys)
+ return fmt.Errorf("Invalid detach keys (%s) provided", c.DetachKeys)
}
}
diff --git a/integration-cli/docker_cli_run_unix_test.go b/integration-cli/docker_cli_run_unix_test.go
index 7a17766976..ed47e2949b 100644
--- a/integration-cli/docker_cli_run_unix_test.go
+++ b/integration-cli/docker_cli_run_unix_test.go
@@ -229,7 +229,7 @@ func (s *DockerSuite) TestRunAttachDetachFromInvalidFlag(c *check.C) {
c.Fatal(err)
}
// it should print a warning to indicate the detach key flag is invalid
- errStr := "Invalid escape keys (ctrl-A,a) provided"
+ errStr := "Invalid detach keys (ctrl-A,a) provided"
c.Assert(strings.TrimSpace(out), checker.Equals, errStr)
}