Skip to content

Commit 3f97d11

Browse files
committed
fix: various e2e fixes
1 parent f6addee commit 3f97d11

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/e2e-android.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ jobs:
124124
timeout-minutes: 10
125125
run: |
126126
while ! nc -z '127.0.0.1' 60001; do sleep 1; done
127-
while ! nc -z '127.0.0.1' 10009; do sleep 1; done
127+
sudo bash -c "while [ ! -f docker/lnd/data/chain/bitcoin/regtest/admin.macaroon ]; do sleep 1; done"
128128
sudo chmod -R 777 docker/lnd
129129
130130
- name: Test attempt 1
@@ -173,9 +173,12 @@ jobs:
173173

174174
- name: Restart docker before last attempt
175175
if: steps.test1.outcome != 'success' && steps.test2.outcome != 'success' && steps.test3.outcome != 'success'
176+
timeout-minutes: 10
176177
run: |
177178
cd docker && docker compose down -t 60 && docker compose up --quiet-pull -d && cd ..
178179
while ! nc -z '127.0.0.1' 60001; do sleep 1; done
180+
sudo bash -c "while [ ! -f docker/lnd/data/chain/bitcoin/regtest/admin.macaroon ]; do sleep 1; done"
181+
sudo chmod -R 777 docker/lnd
179182
180183
- name: Test attempt 4
181184
if: steps.test1.outcome != 'success' && steps.test2.outcome != 'success' && steps.test3.outcome != 'success'

.github/workflows/e2e-ios.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
echo ' npmAuthToken: "${{ secrets.NPMJS_READ_RN_PUBKY }}"' >> .yarnrc.yml
6262
6363
- name: Yarn Install
64-
run: yarn --no-audit --prefer-offline || yarn --no-audit --prefer-offline || yarn
64+
run: yarn || yarn
6565
env:
6666
HUSKY: 0
6767

@@ -91,7 +91,10 @@ jobs:
9191
- name: Restart docker before last attempt
9292
if: steps.test1.outcome != 'success' && steps.test2.outcome != 'success' && steps.test3.outcome != 'success'
9393
run: |
94-
cd docker && docker compose down -t 60 && docker compose up --force-recreate --quiet-pull -d && cd ..
94+
cd docker
95+
docker compose down -t 60
96+
rm -rf lnd
97+
docker compose up --force-recreate --quiet-pull -d
9598
while ! nc -z '127.0.0.1' 60001; do sleep 1; done
9699
97100
- name: Test attempt 4

e2e/channels.e2e.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ d('Transfer', () => {
276276
// TODO: mine single blocks and check updated transfer time
277277

278278
// Sometimes the channel is only opened after restart
279-
await device.launchApp();
279+
await launchAndWait();
280280

281281
// wait for channel to be opened
282282
await waitForActiveChannel(lnd, ldkNodeId);

0 commit comments

Comments
 (0)