Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Be more generous with the unit test timeout #2679

Merged
merged 2 commits into from
Dec 11, 2019
Merged

Be more generous with the unit test timeout #2679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50aeec9
Be more generous with the unit test timeout
2opremio Dec 11, 2019
826025f
We no longer have a vendor directory
2opremio Dec 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ jobs:
keys:
- go-mod-{{ checksum "go.mod" }}
- go-mod-
- run: make test TEST_FLAGS="-race -tags integration -timeout 60s"
# Note that the test timeout is per Go package
- run: make test TEST_FLAGS="-race -tags integration -timeout 5m"
- run: make check-generated
- run: make all
- run: make e2e
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ realclean: clean
rm -rf ./cache

test: test/bin/helm test/bin/kubectl test/bin/kustomize $(GENERATED_TEMPLATES_FILE)
PATH="${PWD}/bin:${PWD}/test/bin:${PATH}" go test ${TEST_FLAGS} $(shell go list ./... | grep -v "^github.com/fluxcd/flux/vendor" | sort -u)
PATH="${PWD}/bin:${PWD}/test/bin:${PATH}" go test ${TEST_FLAGS} $(shell go list ./... | sort -u)

e2e: lint-e2e test/bin/helm test/bin/kubectl test/e2e/bats $(GOBIN)/fluxctl build/.flux.done
PATH="${PWD}/test/bin:${PATH}" CURRENT_OS_ARCH=$(CURRENT_OS_ARCH) test/e2e/run.bash
Expand Down