Skip to content

Commit

Permalink
fix: various e2e fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
limpbrains committed Oct 7, 2024
1 parent f6addee commit 3f97d11
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 4 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/e2e-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/e2e-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e/channels.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 3f97d11

Please sign in to comment.