git.delta.rocks / unique-network / refs/commits / b5153bb1bb07

difftreelog

resolve merge conflict

Alexander Aksenov2022-09-12parents: #d2c56f6 #c4493f1.patch.diff
in: master

3 files changed

modified.github/workflows/dev-build-tests_v2.ymldiffbeforeafterboth
6868
69 - name: Run tests69 - name: Run tests
70 working-directory: tests70 working-directory: tests
71 run: |71 run: |
72 yarn install72 yarn install
73 yarn add mochawesome73 yarn add mochawesome
74 echo "Ready to start tests"74 echo "Ready to start tests"
75 node scripts/readyness.js75 node scripts/readyness.js
76 echo "Ready to start tests"76 yarn polkadot-types
77 yarn polkadot-types77 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
78 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
79 env:78 env:
80 RPC_URL: http://127.0.0.1:9933/79 RPC_URL: http://127.0.0.1:9933/
8180
modified.github/workflows/node-only-update_v2.ymldiffbeforeafterboth
158158
159 - name: Run tests before Node Parachain upgrade159 - name: Run tests before Node Parachain upgrade
160 working-directory: tests160 working-directory: tests
161 run: |161 run: |
162 yarn install162 yarn install
163 yarn add mochawesome163 yarn add mochawesome
164 node scripts/readyness.js164 node scripts/readyness.js
165 echo "Ready to start tests"165 echo "Ready to start tests"
166 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}166 yarn polkadot-types
167 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
167 env:168 env:
168 RPC_URL: http://127.0.0.1:9933/169 RPC_URL: http://127.0.0.1:9933/
169170
234235
235 - name: Run tests after Node Parachain upgrade236 - name: Run tests after Node Parachain upgrade
236 working-directory: tests237 working-directory: tests
237 run: |238 run: |
238 yarn install239 yarn install
239 yarn add mochawesome240 yarn add mochawesome
240 node scripts/readyness.js241 node scripts/readyness.js
241 echo "Ready to start tests"242 echo "Ready to start tests"
242 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}243 yarn polkadot-types
244 NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
243 env:245 env:
244 RPC_URL: http://127.0.0.1:9933/246 RPC_URL: http://127.0.0.1:9933/
245247
modifiedtests/scripts/readyness.jsdiffbeforeafterboth
6 await api.isReadyOrError;6 await api.isReadyOrError;
77
8 const head = (await api.rpc.chain.getHeader()).number.toNumber();8 const head = (await api.rpc.chain.getHeader()).number.toNumber();
9 await api.disconnect();
9 if(head < 1) throw Error('No block #1');10 if(head < 1) throw Error('No block #1');
1011
11 await api.disconnect();
12}12}
1313
14const sleep = time => {14const sleep = time => {