Skip to content

Commit

Permalink
Revert "make sure tests start and use their own daemon"
Browse files Browse the repository at this point in the history
This reverts commit df5b01d1aac621bedbac1362a27e41bfe430223b.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
  • Loading branch information
thaJeztah committed Aug 10, 2021
1 parent c035b63 commit 103c0d8
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions integration-cli/docker_cli_daemon_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -853,14 +853,14 @@ func (s *DockerDaemonSuite) TestDaemonIP(c *testing.T) {

func (s *DockerDaemonSuite) TestDaemonICCPing(c *testing.T) {
testRequires(c, bridgeNfIptables)
d := s.d

bridgeName := "external-bridge"
bridgeIP := "192.169.1.1/24"

createInterface(c, "bridge", bridgeName, bridgeIP)
defer deleteInterface(c, bridgeName)

d := daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))
d.StartWithBusybox(c, "--bridge", bridgeName, "--icc=false")
defer d.Restart(c)

Expand All @@ -886,13 +886,14 @@ func (s *DockerDaemonSuite) TestDaemonICCPing(c *testing.T) {
}

func (s *DockerDaemonSuite) TestDaemonICCLinkExpose(c *testing.T) {
d := s.d

bridgeName := "external-bridge"
bridgeIP := "192.169.1.1/24"

createInterface(c, "bridge", bridgeName, bridgeIP)
defer deleteInterface(c, bridgeName)

d := daemon.New(c, dockerBinary, dockerdBinary, testdaemon.WithEnvironment(testEnv.Execution))
d.StartWithBusybox(c, "--bridge", bridgeName, "--icc=false")
defer d.Restart(c)

Expand Down

0 comments on commit 103c0d8

Please sign in to comment.