summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Sargent <99003+sarge@users.noreply.github.com>2020-03-26 03:55:14 +1300
committerGitHub <noreply@github.com>2020-03-25 08:55:14 -0600
commitba08833b2acceb054177149f1de1c45a548bd36b (patch)
tree5400cd4065861cf5f006d778423d28775da6d6d7
parent9eecd698da8b2f2087ae3f28685d8353fca23d85 (diff)
ci: exclude integration tests for now (#3188)
A workaround for inconsistent results on Windows
-rw-r--r--.github/workflows/ci.yml2
-rw-r--r--caddytest/caddytest.go5
2 files changed, 6 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 43bac7f..4bd29da 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -93,7 +93,7 @@ jobs:
# continue-on-error: true
run: |
# (go test -v -coverprofile=cover-profile.out -race ./... 2>&1) > test-results/test-result.out
- go test -v -coverprofile="cover-profile.out" -race ./...
+ go test -v -coverprofile="cover-profile.out" -short -race ./...
# echo "::set-output name=status::$?"
# Relevant step if we reinvestigate publishing test/coverage reports
diff --git a/caddytest/caddytest.go b/caddytest/caddytest.go
index ed503eb..0f2799f 100644
--- a/caddytest/caddytest.go
+++ b/caddytest/caddytest.go
@@ -68,6 +68,11 @@ func InitServer(t *testing.T, rawConfig string, configType string) {
// type. The configType must be either "json" or the adapter type.
func initServer(t *testing.T, rawConfig string, configType string) error {
+ if testing.Short() {
+ t.SkipNow()
+ return nil
+ }
+
err := validateTestPrerequisites()
if err != nil {
t.Skipf("skipping tests as failed integration prerequisites. %s", err)