iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7474 from hashicorp/test_timeout_bump 

increase timeout for tests to reduce flakiness in travis
This commit is contained in:
Megan Marsh 2019-04-05 13:00:45 -07:00 committed by GitHub
parent 3777f7d34a 12bd1c5f96
commit 1d7b6fd810
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -102,7 +102,7 @@ generate: deps ## Generate dynamically generated code
gofmt -w command/plugin.go gofmt -w command/plugin.go
test: fmt-check mode-check vet ## Run unit tests test: fmt-check mode-check vet ## Run unit tests
@go test $(TEST) $(TESTARGS) -timeout=2m @go test $(TEST) $(TESTARGS) -timeout=3m
# testacc runs acceptance tests # testacc runs acceptance tests
testacc: deps generate ## Run acceptance tests testacc: deps generate ## Run acceptance tests
@ -110,7 +110,7 @@ testacc: deps generate ## Run acceptance tests
PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m PACKER_ACC=1 go test -v $(TEST) $(TESTARGS) -timeout=45m
testrace: fmt-check mode-check vet ## Test with race detection enabled testrace: fmt-check mode-check vet ## Test with race detection enabled
@go test -race $(TEST) $(TESTARGS) -timeout=2m -p=8 @go test -race $(TEST) $(TESTARGS) -timeout=3m -p=8
updatedeps: updatedeps:
@echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md" @echo "INFO: Packer deps are managed by govendor. See .github/CONTRIBUTING.md"