From 756b5d9171c7bd3e6303a98b302354c07de6b665 Mon Sep 17 00:00:00 2001 From: Ivan Vershigora Date: Mon, 7 Oct 2024 13:02:21 +0100 Subject: [PATCH] fix: various e2e fixes --- .github/workflows/e2e-android.yml | 5 ++++- .github/workflows/e2e-ios.yml | 7 +++++-- e2e/channels.e2e.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml index 642435259..b617c839c 100644 --- a/.github/workflows/e2e-android.yml +++ b/.github/workflows/e2e-android.yml @@ -124,7 +124,7 @@ jobs: timeout-minutes: 10 run: | while ! nc -z '127.0.0.1' 60001; do sleep 1; done - while ! nc -z '127.0.0.1' 10009; do sleep 1; done + sudo bash -c "while [ ! -f docker/lnd/data/chain/bitcoin/regtest/admin.macaroon ]; do sleep 1; done" sudo chmod -R 777 docker/lnd - name: Test attempt 1 @@ -173,9 +173,12 @@ jobs: - name: Restart docker before last attempt if: steps.test1.outcome != 'success' && steps.test2.outcome != 'success' && steps.test3.outcome != 'success' + timeout-minutes: 10 run: | cd docker && docker compose down -t 60 && docker compose up --quiet-pull -d && cd .. while ! nc -z '127.0.0.1' 60001; do sleep 1; done + sudo bash -c "while [ ! -f docker/lnd/data/chain/bitcoin/regtest/admin.macaroon ]; do sleep 1; done" + sudo chmod -R 777 docker/lnd - name: Test attempt 4 if: steps.test1.outcome != 'success' && steps.test2.outcome != 'success' && steps.test3.outcome != 'success' diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml index bd236826c..229f4acca 100644 --- a/.github/workflows/e2e-ios.yml +++ b/.github/workflows/e2e-ios.yml @@ -61,7 +61,7 @@ jobs: echo ' npmAuthToken: "${{ secrets.NPMJS_READ_RN_PUBKY }}"' >> .yarnrc.yml - name: Yarn Install - run: yarn --no-audit --prefer-offline || yarn --no-audit --prefer-offline || yarn + run: yarn || yarn env: HUSKY: 0 @@ -91,7 +91,10 @@ jobs: - name: Restart docker before last attempt if: steps.test1.outcome != 'success' && steps.test2.outcome != 'success' && steps.test3.outcome != 'success' run: | - cd docker && docker compose down -t 60 && docker compose up --force-recreate --quiet-pull -d && cd .. + cd docker + docker compose down -t 60 + rm -rf lnd + docker compose up --force-recreate --quiet-pull -d while ! nc -z '127.0.0.1' 60001; do sleep 1; done - name: Test attempt 4 diff --git a/e2e/channels.e2e.js b/e2e/channels.e2e.js index 178fb1a63..02c7a231b 100644 --- a/e2e/channels.e2e.js +++ b/e2e/channels.e2e.js @@ -276,7 +276,7 @@ d('Transfer', () => { // TODO: mine single blocks and check updated transfer time // Sometimes the channel is only opened after restart - await device.launchApp(); + await launchAndWait(); // wait for channel to be opened await waitForActiveChannel(lnd, ldkNodeId);