oceanprotocol/squid-js
1
0
Fork 0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Code Releases Activity

Fix integration test failtures.

Browse Source
This commit is contained in:
Pedro Gutiérrez 2019-03-14 22:54:04 +01:00 committed by Pedro Gutiérrez
parent 7769789309
commit 19cba1dc57
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -21,8 +21,9 @@ before_script:
- ganache-cli --port 18545 > ganache-cli.log & - ganache-cli --port 18545 > ganache-cli.log &
- git clone https://github.com/oceanprotocol/barge - git clone https://github.com/oceanprotocol/barge
- cd barge - cd barge
- export KEEPER_VERSION=v0.8.5
- export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260" - export KEEPER_OWNER_ROLE_ADDRESS="0xe2DD09d719Da89e5a3D0F2549c7E24566e947260"
- bash -x start_ocean.sh --latest --no-pleuston --local-spree-node 2>&1 > start_ocean.log & - bash -x start_ocean.sh --latest --no-pleuston --local-spree-node --no-acl-contract 2>&1 > start_ocean.log &
- cd .. - cd ..
- ./scripts/unlock-spree-accounts.sh 2>&1 > /dev/null & - ./scripts/unlock-spree-accounts.sh 2>&1 > /dev/null &

2
integration/mocha.opts
View File

@ -3,4 +3,4 @@
--full-trace --full-trace
--exit --exit
--timeout 300000 --timeout 300000
integration/ocean/RegisterServiceAgreementTemplates.test.ts integration/**/*.test.ts integration/ocean/RegisterEscrowAccessSecretStoreTemplate.test.ts integration/**/*.test.ts

8
integration/ocean/ConsumeAssetBrizo.test.ts
View File

@ -56,9 +56,7 @@ describe("Consume Asset (Brizo)", () => {
workExample: "stationId,latitude,longitude,datetime,temperature,humidity423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68", workExample: "stationId,latitude,longitude,datetime,temperature,humidity423432fsd,51.509865,-0.118092,2011-01-01T10:55:11+00:00,7.2,68",
files: [ files: [
{ {
url: "https://testocnfiles.blob.core.windows.net/testfiles/testzkp.pdf", url: "https://raw.githubusercontent.com/oceanprotocol/squid-js/develop/package.json",
checksum: "085340abffh21495345af97c6b0e761",
contentLength: "12324",
}, },
{ {
url: "https://raw.githubusercontent.com/oceanprotocol/squid-js/develop/README.md", url: "https://raw.githubusercontent.com/oceanprotocol/squid-js/develop/README.md",
@ -100,12 +98,12 @@ describe("Consume Asset (Brizo)", () => {
assert.include(path, folder, "The storage path is not correct.") assert.include(path, folder, "The storage path is not correct.")
const files = await new Promise((resolve) => { const files = await new Promise<string[]>((resolve) => {
fs.readdir(path, (err, fileList) => { fs.readdir(path, (err, fileList) => {
resolve(fileList) resolve(fileList)
}) })
}) })
assert.deepEqual(files, ["README.md", "testzkp.pdf"], "Stored files are not correct.") assert.deepEqual(files, ["README.md", "package.json"], "Stored files are not correct.")
}) })
}) })

2
scripts/wait_for_migration_and_extract_keeper_artifacts.sh
View File

@ -13,6 +13,8 @@ until [ $COMMAND_STATUS -eq 0 ] || [ $RETRY_COUNT -eq 120 ]; do
let RETRY_COUNT=RETRY_COUNT+1 let RETRY_COUNT=RETRY_COUNT+1
done done
rm -rf ./artifacts/
if [ $COMMAND_STATUS -ne 0 ]; then if [ $COMMAND_STATUS -ne 0 ]; then
echo "Waited for more than two minutes, but keeper contracts have not been migrated yet. Did you run an Ethereum RPC client and the migration script?" echo "Waited for more than two minutes, but keeper contracts have not been migrated yet. Did you run an Ethereum RPC client and the migration script?"
exit 1 exit 1