소스 검색

Merge pull request #34695 from dnephin/fix-rename-integration-test

Remove assertions that were testing CLI behaviour
Brian Goff 7 년 전
부모
커밋
a337aaab08
1개의 변경된 파일1개의 추가작업 그리고 12개의 파일을 삭제
  1. 1 12
      integration-cli/docker_cli_rename_test.go

+ 1 - 12
integration-cli/docker_cli_rename_test.go

@@ -69,6 +69,7 @@ func (s *DockerSuite) TestRenameCheckNames(c *check.C) {
 	})
 	})
 }
 }
 
 
+// TODO: move to unit test
 func (s *DockerSuite) TestRenameInvalidName(c *check.C) {
 func (s *DockerSuite) TestRenameInvalidName(c *check.C) {
 	runSleepingContainer(c, "--name", "myname")
 	runSleepingContainer(c, "--name", "myname")
 
 
@@ -76,18 +77,6 @@ func (s *DockerSuite) TestRenameInvalidName(c *check.C) {
 	c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
 	c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
 	c.Assert(out, checker.Contains, "Invalid container name", check.Commentf("%v", err))
 	c.Assert(out, checker.Contains, "Invalid container name", check.Commentf("%v", err))
 
 
-	out, _, err = dockerCmdWithError("rename", "myname")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
-	c.Assert(out, checker.Contains, "requires exactly 2 argument(s).", check.Commentf("%v", err))
-
-	out, _, err = dockerCmdWithError("rename", "myname", "")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
-	c.Assert(out, checker.Contains, "may be empty", check.Commentf("%v", err))
-
-	out, _, err = dockerCmdWithError("rename", "", "newname")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming container with empty name should have failed: %s", out))
-	c.Assert(out, checker.Contains, "may be empty", check.Commentf("%v", err))
-
 	out, _ = dockerCmd(c, "ps", "-a")
 	out, _ = dockerCmd(c, "ps", "-a")
 	c.Assert(out, checker.Contains, "myname", check.Commentf("Output of docker ps should have included 'myname': %s", out))
 	c.Assert(out, checker.Contains, "myname", check.Commentf("Output of docker ps should have included 'myname': %s", out))
 }
 }