Use short test to signal that we dont run integration

Signed-off-by: Kristoffer Dalby <kristoffer@tailscale.com>
juanfont · Oct 18, 2022 · dfadb96 · dfadb96
1 parent c6f82c3
commit dfadb96
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ build:
 dev: lint test build
 
 test:
-	@go test -coverprofile=coverage.out ./...
+	@go test -short -coverprofile=coverage.out ./...
 
 test_integration: test_integration_cli test_integration_derp test_integration_oidc test_integration_general
 

diff --git a/integration_cli_test.go b/integration_cli_test.go
@@ -27,6 +27,10 @@ type IntegrationCLITestSuite struct {
 }
 
 func TestIntegrationCLITestSuite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration tests due to short flag")
+	}
+
 	s := new(IntegrationCLITestSuite)
 
 	suite.Run(t, s)

diff --git a/integration_embedded_derp_test.go b/integration_embedded_derp_test.go
@@ -45,6 +45,10 @@ type IntegrationDERPTestSuite struct {
 }
 
 func TestIntegrationDERPTestSuite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration tests due to short flag")
+	}
+
 	saveLogs, err := GetEnvBool("HEADSCALE_INTEGRATION_SAVE_LOG")
 	if err != nil {
 		saveLogs = false

diff --git a/integration_general_test.go b/integration_general_test.go
@@ -40,6 +40,10 @@ type IntegrationTestSuite struct {
 }
 
 func TestIntegrationGeneralTestSuite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration tests due to short flag")
+	}
+
 	saveLogs, err := GetEnvBool("HEADSCALE_INTEGRATION_SAVE_LOG")
 	if err != nil {
 		saveLogs = false

diff --git a/integration_oidc_test.go b/integration_oidc_test.go
@@ -44,6 +44,10 @@ type IntegrationOIDCTestSuite struct {
 }
 
 func TestIntegrationOIDCTestSuite(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration tests due to short flag")
+	}
+
 	saveLogs, err := GetEnvBool("HEADSCALE_INTEGRATION_SAVE_LOG")
 	if err != nil {
 		saveLogs = false