From 1b35413a338e24a635196f70cebd63e376c38b02 Mon Sep 17 00:00:00 2001 From: Santhosh Manohar Date: Thu, 3 Nov 2016 11:04:37 -0700 Subject: [PATCH] Fix IT case for network name validation Signed-off-by: Santhosh Manohar Upstream-commit: 9cebccfb95b75e7688b897d74c1eee9eb668526f Component: engine --- .../docker_cli_network_unix_test.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_network_unix_test.go b/components/engine/integration-cli/docker_cli_network_unix_test.go index b50db133fc..548ca291d0 100644 --- a/components/engine/integration-cli/docker_cli_network_unix_test.go +++ b/components/engine/integration-cli/docker_cli_network_unix_test.go @@ -1655,17 +1655,16 @@ func (s *DockerSuite) TestDockerNetworkInternalMode(c *check.C) { c.Assert(err, check.IsNil) } -// Test for #21401 +// Test for special characters in network names. only [a-zA-Z0-9][a-zA-Z0-9_.-] are +// valid characters func (s *DockerNetworkSuite) TestDockerNetworkCreateDeleteSpecialCharacters(c *check.C) { - dockerCmd(c, "network", "create", "test@#$") - assertNwIsAvailable(c, "test@#$") - dockerCmd(c, "network", "rm", "test@#$") - assertNwNotAvailable(c, "test@#$") + _, _, err := dockerCmdWithError("network", "create", "test@#$") + c.Assert(err, check.NotNil) - dockerCmd(c, "network", "create", "kiwl$%^") - assertNwIsAvailable(c, "kiwl$%^") - dockerCmd(c, "network", "rm", "kiwl$%^") - assertNwNotAvailable(c, "kiwl$%^") + dockerCmd(c, "network", "create", "test-1_0.net") + assertNwIsAvailable(c, "test-1_0.net") + dockerCmd(c, "network", "rm", "test-1_0.net") + assertNwNotAvailable(c, "test-1_0.net") } func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) {