myriation/headscale
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Switch from hacking buildtags to selecting tests

Browse source 
Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
This commit is contained in:
Kristoffer Dalby 2022-10-18 14:41:48 +02:00
parent 32c21a05f8
commit c6f82c3646
No known key found for this signature in database
6 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Makefile
View file

@ -34,7 +34,7 @@ test_integration_cli:
-v ~/.cache/hs-integration-go:/go \
-v $$PWD:$$PWD -w $$PWD \
-v /var/run/docker.sock:/var/run/docker.sock golang:1 \
go test -failfast -tags integration_cli,integration -timeout 30m -count=1 ./...
go test -failfast -timeout 30m -count=1 -run IntegrationCLI ./...
test_integration_derp:
docker network rm $$(docker network ls --filter name=headscale --quiet) || true
@ -44,7 +44,7 @@ test_integration_derp:
-v ~/.cache/hs-integration-go:/go \
-v $$PWD:$$PWD -w $$PWD \
-v /var/run/docker.sock:/var/run/docker.sock golang:1 \
go test -failfast -tags integration_derp,integration -timeout 30m -count=1 ./...
go test -failfast -timeout 30m -count=1 -run IntegrationDERP ./...
test_integration_general:
docker network rm $$(docker network ls --filter name=headscale --quiet) || true
@ -54,7 +54,7 @@ test_integration_general:
-v ~/.cache/hs-integration-go:/go \
-v $$PWD:$$PWD -w $$PWD \
-v /var/run/docker.sock:/var/run/docker.sock golang:1 \
go test -failfast -tags integration_general,integration -timeout 30m -count=1 ./...
go test -failfast -timeout 30m -count=1 -run IntegrationGeneral ./...
test_integration_oidc:
docker network rm $$(docker network ls --filter name=headscale --quiet) || true
@ -64,7 +64,7 @@ test_integration_oidc:
-v ~/.cache/hs-integration-go:/go \
-v $$PWD:$$PWD -w $$PWD \
-v /var/run/docker.sock:/var/run/docker.sock golang:1 \
go test -failfast -tags integration_oidc,integration -timeout 30m -count=1 ./...
go test -failfast -timeout 30m -count=1 -run IntegrationOIDC ./...
coverprofile_func:
go tool cover -func=coverage.out

4
integration_cli_test.go
View file

@ -1,5 +1,3 @@
//go:build integration_cli
package headscale
import (
@ -28,7 +26,7 @@ type IntegrationCLITestSuite struct {
env []string
}
func TestCLIIntegrationTestSuite(t *testing.T) {
func TestIntegrationCLITestSuite(t *testing.T) {
s := new(IntegrationCLITestSuite)
suite.Run(t, s)

2
integration_common_test.go
View file

@ -1,5 +1,3 @@
//go:build integration
package headscale
import (

4
integration_embedded_derp_test.go
View file

@ -1,5 +1,3 @@
//go:build integration_derp
package headscale
import (
@ -46,7 +44,7 @@ type IntegrationDERPTestSuite struct {
joinWaitGroup sync.WaitGroup
}
func TestDERPIntegrationTestSuite(t *testing.T) {
func TestIntegrationDERPTestSuite(t *testing.T) {
saveLogs, err := GetEnvBool("HEADSCALE_INTEGRATION_SAVE_LOG")
if err != nil {
saveLogs = false

4
integration_general_test.go
View file

@ -1,5 +1,3 @@
//go:build integration_general
package headscale
import (
@ -41,7 +39,7 @@ type IntegrationTestSuite struct {
joinWaitGroup sync.WaitGroup
}
func TestIntegrationTestSuite(t *testing.T) {
func TestIntegrationGeneralTestSuite(t *testing.T) {
saveLogs, err := GetEnvBool("HEADSCALE_INTEGRATION_SAVE_LOG")
if err != nil {
saveLogs = false

4
integration_oidc_test.go
View file

@ -1,5 +1,3 @@
//go:build integration_oidc
package headscale
import (
@ -45,7 +43,7 @@ type IntegrationOIDCTestSuite struct {
joinWaitGroup sync.WaitGroup
}
func TestOIDCIntegrationTestSuite(t *testing.T) {
func TestIntegrationOIDCTestSuite(t *testing.T) {
saveLogs, err := GetEnvBool("HEADSCALE_INTEGRATION_SAVE_LOG")
if err != nil {
saveLogs = false