From f863d0101f0a91c2303f7e684fdc9333a62c5e25 Mon Sep 17 00:00:00 2001 From: Ivan Vershigora Date: Mon, 7 Oct 2024 10:11:24 +0100 Subject: [PATCH] fix: various e2e fixes --- .github/workflows/e2e-android.yml | 5 ++++- .github/workflows/e2e-ios.yml | 5 ++++- e2e/channels.e2e.js | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/e2e-android.yml b/.github/workflows/e2e-android.yml index 642435259..9a5e12e7b 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 + 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 + 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..b6efebef5 100644 --- a/.github/workflows/e2e-ios.yml +++ b/.github/workflows/e2e-ios.yml @@ -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);