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
--- a/.github/workflows/dev-build-tests_v2.yml
+++ b/.github/workflows/dev-build-tests_v2.yml
@@ -73,7 +73,6 @@
           yarn add mochawesome
           echo "Ready to start tests"
           node scripts/readyness.js
-          echo "Ready to start tests"
           yarn polkadot-types
           NOW=$(date +%s) && yarn test --reporter mochawesome --reporter-options reportFilename=test-${NOW}
         env:
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
--- a/tests/scripts/readyness.js
+++ b/tests/scripts/readyness.js
@@ -6,9 +6,9 @@
   await api.isReadyOrError;
 
   const head = (await api.rpc.chain.getHeader()).number.toNumber();
+  await api.disconnect();
   if(head < 1) throw Error('No block #1');
 
-  await api.disconnect();
 }
 
 const sleep = time => {