Skip to content
This repository was archived by the owner on Mar 5, 2025. It is now read-only.

Commit 9394a4d

Browse files
cgeweckeryanioholgerd77
authored
Fix windows CI & lengthen verdaccio timeouts (#3421)
* Kill windows node process * Add verdaccio http agent timeout options * Increase verdaccio timeouts & retries * Increase accounts.wallet test timeouts * Add check for CI environment when kill node process Co-authored-by: Ryan Ghods <[email protected]> Co-authored-by: Holger Drewes <[email protected]>
1 parent dee72e0 commit 9394a4d

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

scripts/e2e.windows.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,14 @@ cd windows_test
1414
# Install web3 as dep
1515
npm init --yes
1616
npm install web3@e2e --save --registry http://localhost:4873
17-
node ./basic_usage.js
17+
./basic_usage.js
1818

1919
# Shutdown verdaccio server
2020
cd ..
2121
source verdaccio_pid
2222
kill -9 $VERDACCIO_PID
2323

24-
# Debugging...
25-
ps -ef
24+
# Terminate stray node process
25+
if [ ! -z "$CI" ]; then
26+
kill -9 $(grep node <(ps -ef) | sed 's/.*\travis *\([0-9]*\).*/\1/')
27+
fi

scripts/js/basic_usage.js

100644100755
File mode changed.

test/eth.accounts.wallet.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,12 @@ describe("eth", function () {
264264
assert.equal(ethAccounts.wallet.length, 0);
265265

266266
done();
267-
}, 1);
267+
}, 1000);
268268
});
269269

270270
it("encrypt then decrypt wallet", function() {
271+
this.timeout(10000);
272+
271273
var ethAccounts = new Accounts();
272274
var password = "qwerty";
273275

verdaccio.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,25 @@ auth:
55
uplinks:
66
npmjs:
77
url: https://registry.npmjs.org/
8-
timeout: 100000ms
8+
timeout: 10m
9+
fail_timeout: 10m
10+
max_fails: 20
11+
agent_options: { keepAlive: true, keepAliveMsecs: 1000000, timeout: 100000 }
912
yarn:
1013
url: https://registry.yarnpkg.com/
11-
timeout: 100000ms
14+
timeout: 10m
15+
fail_timeout: 10m
16+
max_fails: 20
17+
agent_options: { keepAlive: true, keepAliveMsecs: 1000000, timeout: 100000 }
1218
packages:
1319
'@*/*':
1420
# scoped packages
1521
access: $all
1622
publish: $all
17-
proxy: npmjs
23+
proxy: npmjs yarn
1824
'**':
1925
access: $all
2026
publish: $all
21-
proxy: npmjs
27+
proxy: npmjs yarn
2228
logs:
2329
- {type: stdout, format: pretty, level: warn}

0 commit comments

Comments
 (0)