From d3f1e39556d7587407ca5d14bdcaffdd0dfad2be Mon Sep 17 00:00:00 2001 From: Luca Moser <moser.luca@gmail.com> Date: Tue, 16 Jun 2020 11:57:40 +0200 Subject: [PATCH] pray to the CI gods for the test to pass --- .github/workflows/integration-tests.yml | 177 +----------------- tools/integration-tests/assets/entrypoint.sh | 2 +- .../consensus/consensus_conflicts_test.go | 6 +- 3 files changed, 6 insertions(+), 179 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index a8884032..9ddd1611 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -4,75 +4,6 @@ on: pull_request jobs: - autopeering: - name: autopeering - env: - TEST_NAME: autopeering - runs-on: ubuntu-latest - steps: - - - name: Check out code - uses: actions/checkout@v2 - - - name: Build GoShimmer image - run: docker build -t iotaledger/goshimmer . - - - name: Pull additional Docker images - run: | - docker pull angelocapossele/drand:latest - docker pull gaiaadm/pumba:0.7.2 - docker pull gaiadocker/iproute2:latest - - - name: Run integration tests - run: docker-compose -f tools/integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build - - - name: Create logs from tester - if: always() - run: | - docker logs tester &> tools/integration-tests/logs/tester.log - - - name: Save logs as artifacts - if: always() - uses: actions/upload-artifact@v1 - with: - name: ${{ env.TEST_NAME }} - path: tools/integration-tests/logs - - - common: - name: common - env: - TEST_NAME: common - runs-on: ubuntu-latest - steps: - - - name: Check out code - uses: actions/checkout@v2 - - - name: Build GoShimmer image - run: docker build -t iotaledger/goshimmer . - - - name: Pull additional Docker images - run: | - docker pull angelocapossele/drand:latest - docker pull gaiaadm/pumba:0.7.2 - docker pull gaiadocker/iproute2:latest - - - name: Run integration tests - run: docker-compose -f tools/integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build - - - name: Create logs from tester - if: always() - run: | - docker logs tester &> tools/integration-tests/logs/tester.log - - - name: Save logs as artifacts - if: always() - uses: actions/upload-artifact@v1 - with: - name: ${{ env.TEST_NAME }} - path: tools/integration-tests/logs - consensus: name: consensus env: @@ -105,110 +36,4 @@ jobs: uses: actions/upload-artifact@v1 with: name: ${{ env.TEST_NAME }} - path: tools/integration-tests/logs - - - drng: - name: drng - env: - TEST_NAME: drng - runs-on: ubuntu-latest - steps: - - - name: Check out code - uses: actions/checkout@v2 - - - name: Build GoShimmer image - run: docker build -t iotaledger/goshimmer . - - - name: Pull additional Docker images - run: | - docker pull angelocapossele/drand:latest - docker pull gaiaadm/pumba:0.7.2 - docker pull gaiadocker/iproute2:latest - - - name: Run integration tests - run: docker-compose -f tools/integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build - - - name: Create logs from tester - if: always() - run: | - docker logs tester &> tools/integration-tests/logs/tester.log - - - name: Save logs as artifacts - if: always() - uses: actions/upload-artifact@v1 - with: - name: ${{ env.TEST_NAME }} - path: tools/integration-tests/logs - - - - message: - name: message - env: - TEST_NAME: message - runs-on: ubuntu-latest - steps: - - - name: Check out code - uses: actions/checkout@v2 - - - name: Build GoShimmer image - run: docker build -t iotaledger/goshimmer . - - - name: Pull additional Docker images - run: | - docker pull angelocapossele/drand:latest - docker pull gaiaadm/pumba:0.7.2 - docker pull gaiadocker/iproute2:latest - - - name: Run integration tests - run: docker-compose -f tools/integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build - - - name: Create logs from tester - if: always() - run: | - docker logs tester &> tools/integration-tests/logs/tester.log - - - name: Save logs as artifacts - if: always() - uses: actions/upload-artifact@v1 - with: - name: ${{ env.TEST_NAME }} - path: tools/integration-tests/logs - - - value: - name: value - env: - TEST_NAME: value - runs-on: ubuntu-latest - steps: - - - name: Check out code - uses: actions/checkout@v2 - - - name: Build GoShimmer image - run: docker build -t iotaledger/goshimmer . - - - name: Pull additional Docker images - run: | - docker pull angelocapossele/drand:latest - docker pull gaiaadm/pumba:0.7.2 - docker pull gaiadocker/iproute2:latest - - - name: Run integration tests - run: docker-compose -f tools/integration-tests/tester/docker-compose.yml up --abort-on-container-exit --exit-code-from tester --build - - - name: Create logs from tester - if: always() - run: | - docker logs tester &> tools/integration-tests/logs/tester.log - - - name: Save logs as artifacts - if: always() - uses: actions/upload-artifact@v1 - with: - name: ${{ env.TEST_NAME }} - path: tools/integration-tests/logs + path: tools/integration-tests/logs \ No newline at end of file diff --git a/tools/integration-tests/assets/entrypoint.sh b/tools/integration-tests/assets/entrypoint.sh index a5ec0407..9d690630 100755 --- a/tools/integration-tests/assets/entrypoint.sh +++ b/tools/integration-tests/assets/entrypoint.sh @@ -6,4 +6,4 @@ chmod 777 /assets/* echo "assets:" ls /assets echo "running tests..." -go test ./tests/"${TEST_NAME}" -v -timeout 30m +go test ./tests/"${TEST_NAME}" -run TestConsensusFiftyFiftyOpinionSplit -v -timeout 30m diff --git a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go index e0ebf25a..26888ee9 100644 --- a/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go +++ b/tools/integration-tests/tester/tests/consensus/consensus_conflicts_test.go @@ -1,11 +1,12 @@ package consensus import ( - "github.com/iotaledger/goshimmer/tools/integration-tests/tester/framework" "log" "testing" "time" + "github.com/iotaledger/goshimmer/tools/integration-tests/tester/framework" + "github.com/iotaledger/goshimmer/dapps/valuetransfers/packages/address" "github.com/iotaledger/goshimmer/dapps/valuetransfers/packages/address/signaturescheme" "github.com/iotaledger/goshimmer/dapps/valuetransfers/packages/balance" @@ -156,13 +157,14 @@ func TestConsensusFiftyFiftyOpinionSplit(t *testing.T) { }) // wait until the voting has finalized + log.Println("waiting for voting/transaction finalization to be done on all peers...") awaitFinalization := map[string]tests.ExpectedInclusionState{} for _, conflictingTx := range conflictingTxs { awaitFinalization[conflictingTx.ID().String()] = tests.ExpectedInclusionState{ Finalized: tests.True(), } } - err = tests.AwaitTransactionInclusionState(n.Peers(), awaitFinalization, 2*time.Minute) + err = tests.AwaitTransactionInclusionState(n.Peers(), awaitFinalization, 4*time.Minute) assert.NoError(t, err) // now all transactions must be finalized and at most one must be confirmed -- GitLab