Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
| ... | ... |
@@ -1757,17 +1757,11 @@ func (s *DockerDaemonSuite) TestDaemonRestartLocalVolumes(c *check.C) {
|
| 1757 | 1757 |
} |
| 1758 | 1758 |
|
| 1759 | 1759 |
func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {
|
| 1760 |
- for _, driver := range []string{
|
|
| 1761 |
- "syslog", |
|
| 1762 |
- "gelf", |
|
| 1763 |
- } {
|
|
| 1764 |
- args := []string{"--log-driver=" + driver, "--log-opt", driver + "-address=corrupted:42"}
|
|
| 1765 |
- c.Assert(s.d.Start(args...), check.NotNil, check.Commentf(fmt.Sprintf("Expected daemon not to start with invalid %s-address provided", driver)))
|
|
| 1766 |
- expected := fmt.Sprintf("Failed to set log opts: %s-address should be in form proto://address", driver)
|
|
| 1767 |
- runCmd := exec.Command("grep", expected, s.d.LogfileName())
|
|
| 1768 |
- if out, _, err := runCommandWithOutput(runCmd); err != nil {
|
|
| 1769 |
- c.Fatalf("Expected %q message; but doesn't exist in log: %q, err: %v", expected, out, err)
|
|
| 1770 |
- } |
|
| 1760 |
+ c.Assert(s.d.Start("--log-driver=syslog", "--log-opt", "syslog-address=corrupted:42"), check.NotNil)
|
|
| 1761 |
+ expected := "Failed to set log opts: syslog-address should be in form proto://address" |
|
| 1762 |
+ runCmd := exec.Command("grep", expected, s.d.LogfileName())
|
|
| 1763 |
+ if out, _, err := runCommandWithOutput(runCmd); err != nil {
|
|
| 1764 |
+ c.Fatalf("Expected %q message; but doesn't exist in log: %q, err: %v", expected, out, err)
|
|
| 1771 | 1765 |
} |
| 1772 | 1766 |
} |
| 1773 | 1767 |
|