From 566b8c3df34575fbf2fbd0d340059905c87616b2 Mon Sep 17 00:00:00 2001
From: Kristoffer Dalby <kradalby@kradalby.no>
Date: Mon, 27 Jun 2022 12:07:30 +0000
Subject: [PATCH] Fix issue were dockertest fails to start because of container
mismatch
---
integration_cli_test.go | 5 +++++
integration_embedded_derp_test.go | 5 +++++
integration_test.go | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/integration_cli_test.go b/integration_cli_test.go
index 11daae9..f9ff5ec 100644
--- a/integration_cli_test.go
+++ b/integration_cli_test.go
@@ -68,6 +68,11 @@ func (s *IntegrationCLITestSuite) SetupTest() {
Cmd: []string{"headscale", "serve"},
}
+ err = s.pool.RemoveContainerByName(headscaleHostname)
+ if err != nil {
+ s.FailNow(fmt.Sprintf("Could not remove existing container before building test: %s", err), "")
+ }
+
fmt.Println("Creating headscale container")
if pheadscale, err := s.pool.BuildAndRunWithBuildOptions(headscaleBuildOptions, headscaleOptions, DockerRestartPolicy); err == nil {
s.headscale = *pheadscale
diff --git a/integration_embedded_derp_test.go b/integration_embedded_derp_test.go
index 0350139..ecca8ba 100644
--- a/integration_embedded_derp_test.go
+++ b/integration_embedded_derp_test.go
@@ -129,6 +129,11 @@ func (s *IntegrationDERPTestSuite) SetupSuite() {
},
}
+ err = s.pool.RemoveContainerByName(headscaleHostname)
+ if err != nil {
+ s.FailNow(fmt.Sprintf("Could not remove existing container before building test: %s", err), "")
+ }
+
log.Println("Creating headscale container")
if pheadscale, err := s.pool.BuildAndRunWithBuildOptions(headscaleBuildOptions, headscaleOptions, DockerRestartPolicy); err == nil {
s.headscale = *pheadscale
diff --git a/integration_test.go b/integration_test.go
index 119fd4f..2214b89 100644
--- a/integration_test.go
+++ b/integration_test.go
@@ -246,6 +246,11 @@ func (s *IntegrationTestSuite) SetupSuite() {
Cmd: []string{"headscale", "serve"},
}
+ err = s.pool.RemoveContainerByName(headscaleHostname)
+ if err != nil {
+ s.FailNow(fmt.Sprintf("Could not remove existing container before building test: %s", err), "")
+ }
+
log.Println("Creating headscale container")
if pheadscale, err := s.pool.BuildAndRunWithBuildOptions(headscaleBuildOptions, headscaleOptions, DockerRestartPolicy); err == nil {
s.headscale = *pheadscale