From 6b67584d477946cd83b8fa70d9cb3e4ce53703d7 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Mon, 3 Oct 2022 13:27:18 +0200 Subject: [PATCH] Fix DERP name in integration tests Signed-off-by: Kristoffer Dalby --- integration_common_test.go | 2 +- integration_embedded_derp_test.go | 5 +++-- integration_general_test.go | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration_common_test.go b/integration_common_test.go index 9cce12f..a72af91 100644 --- a/integration_common_test.go +++ b/integration_common_test.go @@ -19,7 +19,7 @@ import ( ) const ( - headscaleHostname = "headscale-derp" + headscaleHostname = "headscale" DOCKER_EXECUTE_TIMEOUT = 10 * time.Second ) diff --git a/integration_embedded_derp_test.go b/integration_embedded_derp_test.go index a31006e..4a8a337 100644 --- a/integration_embedded_derp_test.go +++ b/integration_embedded_derp_test.go @@ -27,6 +27,7 @@ import ( ) const ( + headscaleDerpHostname = "headscale-derp" namespaceName = "derpnamespace" totalContainers = 3 ) @@ -112,7 +113,7 @@ func (s *IntegrationDERPTestSuite) SetupSuite() { } headscaleOptions := &dockertest.RunOptions{ - Name: headscaleHostname, + Name: headscaleDerpHostname, Mounts: []string{ fmt.Sprintf( "%s/integration_test/etc_embedded_derp:/etc/headscale", @@ -127,7 +128,7 @@ func (s *IntegrationDERPTestSuite) SetupSuite() { }, } - err = s.pool.RemoveContainerByName(headscaleHostname) + err = s.pool.RemoveContainerByName(headscaleDerpHostname) if err != nil { s.FailNow( fmt.Sprintf( diff --git a/integration_general_test.go b/integration_general_test.go index 5abdccb..2f61cfe 100644 --- a/integration_general_test.go +++ b/integration_general_test.go @@ -236,7 +236,7 @@ func (s *IntegrationTestSuite) SetupSuite() { } headscaleOptions := &dockertest.RunOptions{ - Name: "headscale", + Name: headscaleHostname, Mounts: []string{ fmt.Sprintf("%s/integration_test/etc:/etc/headscale", currentPath), },