1
0
Fork 0

Merge v2.4 into master

This commit is contained in:
romain 2021-02-16 11:12:09 +01:00
commit 1b21f0723f
59 changed files with 1615 additions and 1400 deletions

View file

@ -482,10 +482,10 @@ func (s *ConsulCatalogSuite) TestSameServiceIDOnDifferentConsulAgent(c *check.C)
s.composeProject.Container(c, "whoami2").NetworkSettings.IPAddress))
c.Assert(err, checker.IsNil)
err = s.deregisterService("whoami1", false)
err = s.deregisterService("whoami", false)
c.Assert(err, checker.IsNil)
err = s.deregisterService("whoami2", true)
err = s.deregisterService("whoami", true)
c.Assert(err, checker.IsNil)
}