Skip to content

Commit

Permalink
Merge pull request #897 from kradalby/integration-remove-v1-genera
Browse files Browse the repository at this point in the history
Remove v1 general integration tests
  • Loading branch information
juanfont authored Oct 30, 2022
2 parents 91c0a15 + 611f7c3 commit c1c22a4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 853 deletions.
35 changes: 0 additions & 35 deletions .github/workflows/test-integration-general.yml

This file was deleted.

12 changes: 1 addition & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ dev: lint test build
test:
@go test -short -coverprofile=coverage.out ./...

test_integration: test_integration_cli test_integration_derp test_integration_oidc test_integration_general
test_integration: test_integration_cli test_integration_derp test_integration_oidc test_integration_v2_general

test_integration_cli:
docker network rm $$(docker network ls --filter name=headscale --quiet) || true
Expand All @@ -46,16 +46,6 @@ test_integration_derp:
-v /var/run/docker.sock:/var/run/docker.sock golang:1 \
go test -failfast -timeout 30m -count=1 -run IntegrationDERP ./...

test_integration_general:
docker network rm $$(docker network ls --filter name=headscale --quiet) || true
docker network create headscale-test || true
docker run -t --rm \
--network headscale-test \
-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 -timeout 30m -count=1 -run IntegrationGeneral ./...

test_integration_oidc:
docker network rm $$(docker network ls --filter name=headscale --quiet) || true
docker network create headscale-test || true
Expand Down
Loading

0 comments on commit c1c22a4

Please sign in to comment.