From 2eb5499d33a037b8d6f73d579310bad8a3384293 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Thu, 5 Jan 2017 15:46:07 -0800 Subject: [PATCH] Add test for swarm error handling Signed-off-by: Tonis Tiigi Upstream-commit: d377b074fdcbf735d9fbafdb9bcab6878e5c0ae9 Component: engine --- .../engine/integration-cli/docker_api_swarm_test.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/components/engine/integration-cli/docker_api_swarm_test.go b/components/engine/integration-cli/docker_api_swarm_test.go index bc36c47691..9310463b66 100644 --- a/components/engine/integration-cli/docker_api_swarm_test.go +++ b/components/engine/integration-cli/docker_api_swarm_test.go @@ -4,6 +4,7 @@ package main import ( "fmt" + "net" "net/http" "os" "path/filepath" @@ -1317,3 +1318,14 @@ func (s *DockerSwarmSuite) TestAPISwarmUnlockNotLocked(c *check.C) { c.Assert(err, checker.NotNil) c.Assert(err.Error(), checker.Contains, "swarm is not locked") } + +// #29885 +func (s *DockerSwarmSuite) TestAPISwarmErrorHandling(c *check.C) { + ln, err := net.Listen("tcp", fmt.Sprintf(":%d", defaultSwarmPort)) + c.Assert(err, checker.IsNil) + defer ln.Close() + d := s.AddDaemon(c, false, false) + err = d.Init(swarm.InitRequest{}) + c.Assert(err, checker.NotNil) + c.Assert(err.Error(), checker.Contains, "address already in use") +}