Skip to content

Commit

Permalink
Use CONFIG_MODE=test for E2E test (0xPolygonHermez#1117)
Browse files Browse the repository at this point in the history
* Use CONFIG_MODE=test for E2E test

* Add -v flag to tests
  • Loading branch information
arnaubennassar authored Sep 2, 2022
1 parent cb22be8 commit a579316
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Test
run: make test-e2e-group-${{ matrix.e2e-group }}
run: CONFIG_MODE="test" make test-e2e-group-${{ matrix.e2e-group }}

# Update check run
- uses: actions/github-script@v5
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ test-full: build-docker compile-scs ## Runs all tests checking race conditions
$(RUNDB); sleep 7
$(RUNZKPROVER); sleep 5
$(RUNZKPROVERMOCK)
trap '$(STOPDB) && $(STOPZKPROVER) && $(STOPZKPROVERMOCK)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 1200s `go list ./... | grep -v \/ci\/e2e-group`
trap '$(STOPDB) && $(STOPZKPROVER) && $(STOPZKPROVERMOCK)' EXIT; MallocNanoZone=0 go test -race -v -p 1 -timeout 1200s `go list ./... | grep -v \/ci\/e2e-group`

.PHONY: test-full-non-e2e
test-full-non-e2e: build-docker compile-scs ## Runs non-e2e tests checking race conditions
Expand All @@ -120,7 +120,7 @@ test-e2e-group-1: build-docker compile-scs ## Runs group 1 e2e tests checking ra
export CONFIG_MODE="test"
$(STOPDB)
$(RUNDB); sleep 7
trap '$(STOPDB)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 600s ./ci/e2e-group1/...
trap '$(STOPDB)' EXIT; MallocNanoZone=0 go test -race -v -p 1 -timeout 600s ./ci/e2e-group1/...

.PHONY: test-e2e-group-2
test-e2e-group-2: build-docker compile-scs ## Runs group 2 e2e tests checking race conditions
Expand All @@ -131,14 +131,14 @@ test-e2e-group-2: build-docker compile-scs ## Runs group 2 e2e tests checking ra
CONFIG_MODE="test" $(RUNZKPROVER)
docker ps -a
docker logs $(DOCKERCOMPOSEZKPROVER)
trap '$(STOPDB) && $(STOPZKPROVER)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 600s ./ci/e2e-group2/...
trap '$(STOPDB) && $(STOPZKPROVER)' EXIT; MallocNanoZone=0 go test -race -v -p 1 -timeout 600s ./ci/e2e-group2/...

.PHONY: test-e2e-group-3
test-e2e-group-3: build-docker compile-scs ## Runs group 3 e2e tests checking race conditions
export CONFIG_MODE="test"
$(STOPDB)
$(RUNDB); sleep 7
trap '$(STOPDB)' EXIT; MallocNanoZone=0 go test -race -p 1 -timeout 600s ./ci/e2e-group3/...
trap '$(STOPDB)' EXIT; MallocNanoZone=0 go test -race -v -p 1 -timeout 600s ./ci/e2e-group3/...

.PHONY: install-linter
install-linter: ## Installs the linter
Expand Down

0 comments on commit a579316

Please sign in to comment.