Browse code

Fix IT case for network name validation

Signed-off-by: Santhosh Manohar <santhosh@docker.com>

Santhosh Manohar authored on 2016/11/04 03:04:37
Showing 1 changed files
... ...
@@ -1655,17 +1655,16 @@ func (s *DockerSuite) TestDockerNetworkInternalMode(c *check.C) {
1655 1655
 	c.Assert(err, check.IsNil)
1656 1656
 }
1657 1657
 
1658
-// Test for #21401
1658
+// Test for special characters in network names. only [a-zA-Z0-9][a-zA-Z0-9_.-] are
1659
+// valid characters
1659 1660
 func (s *DockerNetworkSuite) TestDockerNetworkCreateDeleteSpecialCharacters(c *check.C) {
1660
-	dockerCmd(c, "network", "create", "test@#$")
1661
-	assertNwIsAvailable(c, "test@#$")
1662
-	dockerCmd(c, "network", "rm", "test@#$")
1663
-	assertNwNotAvailable(c, "test@#$")
1664
-
1665
-	dockerCmd(c, "network", "create", "kiwl$%^")
1666
-	assertNwIsAvailable(c, "kiwl$%^")
1667
-	dockerCmd(c, "network", "rm", "kiwl$%^")
1668
-	assertNwNotAvailable(c, "kiwl$%^")
1661
+	_, _, err := dockerCmdWithError("network", "create", "test@#$")
1662
+	c.Assert(err, check.NotNil)
1663
+
1664
+	dockerCmd(c, "network", "create", "test-1_0.net")
1665
+	assertNwIsAvailable(c, "test-1_0.net")
1666
+	dockerCmd(c, "network", "rm", "test-1_0.net")
1667
+	assertNwNotAvailable(c, "test-1_0.net")
1669 1668
 }
1670 1669
 
1671 1670
 func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) {