Browse Source

e2e: compile tests (#6926)

pull/6930/head
Sam Kleinman 3 years ago
committed by GitHub
parent
commit
1998cf7e77
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 10 additions and 12 deletions
  1. +1
    -1
      .github/workflows/e2e-nightly-master.yml
  2. +1
    -1
      .github/workflows/e2e.yml
  3. +5
    -2
      test/e2e/Makefile
  4. +1
    -1
      test/e2e/run-multiple.sh
  5. +1
    -2
      test/e2e/runner/main.go
  6. +1
    -1
      test/e2e/runner/test.go
  7. +0
    -4
      test/e2e/tests/e2e_test.go

+ 1
- 1
.github/workflows/e2e-nightly-master.yml View File

@ -30,7 +30,7 @@ jobs:
- name: Build
working-directory: test/e2e
# Run make jobs in parallel, since we can't run steps in parallel.
run: make -j2 docker generator runner
run: make -j2 docker generator runner tests
- name: Generate testnets
working-directory: test/e2e


+ 1
- 1
.github/workflows/e2e.yml View File

@ -28,7 +28,7 @@ jobs:
- name: Build
working-directory: test/e2e
# Run two make jobs in parallel, since we can't run steps in parallel.
run: make -j2 docker runner
run: make -j2 docker runner tests
if: "env.GIT_DIFF != ''"
- name: Run CI testnet


+ 5
- 2
test/e2e/Makefile View File

@ -1,4 +1,4 @@
all: docker generator runner
all: docker generator runner tests
docker:
docker build --tag tendermint/e2e-node -f docker/Dockerfile ../..
@ -15,4 +15,7 @@ generator:
runner:
go build -o build/runner ./runner
.PHONY: all app docker generator runner
tests:
go test -o build/tests ./tests
.PHONY: all app docker generator runner tests

+ 1
- 1
test/e2e/run-multiple.sh View File

@ -19,7 +19,7 @@ FAILED=()
for MANIFEST in "$@"; do
START=$SECONDS
echo "==> Running testnet $MANIFEST..."
echo "==> Running testnet: $MANIFEST"
if ! ./build/runner -f "$MANIFEST"; then
echo "==> Testnet $MANIFEST failed, dumping manifest..."


+ 1
- 2
test/e2e/runner/main.go View File

@ -63,8 +63,7 @@ func NewCLI() *CLI {
lctx, loadCancel := context.WithCancel(ctx)
defer loadCancel()
go func() {
err := Load(lctx, cli.testnet)
chLoadResult <- err
chLoadResult <- Load(lctx, cli.testnet)
}()
if err := Start(ctx, cli.testnet); err != nil {


+ 1
- 1
test/e2e/runner/test.go View File

@ -15,5 +15,5 @@ func Test(testnet *e2e.Testnet) error {
return err
}
return execVerbose("go", "test", "-count", "1", "./tests/...")
return execVerbose("./build/tests", "-test.count", "1")
}

+ 0
- 4
test/e2e/tests/e2e_test.go View File

@ -3,7 +3,6 @@ package e2e_test
import (
"context"
"os"
"path/filepath"
"sync"
"testing"
@ -72,9 +71,6 @@ func loadTestnet(t *testing.T) e2e.Testnet {
if manifest == "" {
t.Skip("E2E_MANIFEST not set, not an end-to-end test run")
}
if !filepath.IsAbs(manifest) {
manifest = filepath.Join("..", manifest)
}
testnetCacheMtx.Lock()
defer testnetCacheMtx.Unlock()


Loading…
Cancel
Save