From 505febe6a63ee1c93503a1a69725052d7fd77028 Mon Sep 17 00:00:00 2001 From: Alessandro Boch Date: Thu, 2 Feb 2017 15:37:57 -0800 Subject: [PATCH] Revert "Fix IT case for network name validation" This reverts commit 9cebccfb95b75e7688b897d74c1eee9eb668526f. Signed-off-by: Alessandro Boch Upstream-commit: 1e98350ab4ecc2aabdee49a279e353f47bc94225 Component: engine --- .../docker_cli_network_unix_test.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 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 ed06d3b11d..a7f6a73851 100644 --- a/components/engine/integration-cli/docker_cli_network_unix_test.go +++ b/components/engine/integration-cli/docker_cli_network_unix_test.go @@ -1641,16 +1641,17 @@ func (s *DockerSuite) TestDockerNetworkInternalMode(c *check.C) { c.Assert(err, check.IsNil) } -// Test for special characters in network names. only [a-zA-Z0-9][a-zA-Z0-9_.-] are -// valid characters +// Test for #21401 func (s *DockerNetworkSuite) TestDockerNetworkCreateDeleteSpecialCharacters(c *check.C) { - _, _, err := dockerCmdWithError("network", "create", "test@#$") - c.Assert(err, check.NotNil) + dockerCmd(c, "network", "create", "test@#$") + assertNwIsAvailable(c, "test@#$") + dockerCmd(c, "network", "rm", "test@#$") + assertNwNotAvailable(c, "test@#$") - 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") + dockerCmd(c, "network", "create", "kiwl$%^") + assertNwIsAvailable(c, "kiwl$%^") + dockerCmd(c, "network", "rm", "kiwl$%^") + assertNwNotAvailable(c, "kiwl$%^") } func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) {