From f3c009a6f3c8970da72c867492806d037e1569b3 Mon Sep 17 00:00:00 2001 From: apostolof Date: Sun, 28 Feb 2021 15:42:17 +0200 Subject: [PATCH] fix: fix docker contracts test script --- docker/concordia-contracts/test-contracts.sh | 14 ++++++++++---- docker/env/ganache.test.env | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docker/concordia-contracts/test-contracts.sh b/docker/concordia-contracts/test-contracts.sh index c8ac042..f441048 100644 --- a/docker/concordia-contracts/test-contracts.sh +++ b/docker/concordia-contracts/test-contracts.sh @@ -3,11 +3,17 @@ export CHAIN_HOST="$TEST_CHAIN_HOST" export CHAIN_PORT="$TEST_CHAIN_PORT" -yarn _eslint -f html -o /mnt/concordia/test-reports/concordia-contracts-eslint.html --no-color && - (yarn _solhint >/mnt/concordia/test-reports/concordia-contracts-solhint.report) && - (yarn test --network env >/mnt/concordia/test-reports/concordia-contracts-truffle-tests.report) +yarn _eslint -f html -o /mnt/concordia/test-reports/concordia-contracts-eslint.html --no-color +ESLINT_EXIT_STATUS=$? -if [ $? -eq 0 ]; then +yarn _solhint >/mnt/concordia/test-reports/concordia-contracts-solhint.report +SOLHINT_EXIT_STATUS=$? + +yarn test --network env >/mnt/concordia/test-reports/concordia-contracts-truffle-tests.report +grep -qE failing /mnt/concordia/test-reports/concordia-contracts-truffle-tests.report +TRUFFLE_TEST_FAILING=$? + +if [ $ESLINT_EXIT_STATUS -eq 0 ] && [ "$SOLHINT_EXIT_STATUS" -eq 0 ] && [ "$TRUFFLE_TEST_FAILING" -eq 1 ]; then echo "TESTS RAN SUCCESSFULLY!" exit 0 else diff --git a/docker/env/ganache.test.env b/docker/env/ganache.test.env index 479da1f..b81f7a7 100755 --- a/docker/env/ganache.test.env +++ b/docker/env/ganache.test.env @@ -1,5 +1,5 @@ ACCOUNTS_NUMBER=5 -ACCOUNTS_ETHER=1 +ACCOUNTS_ETHER=100 MNEMONIC="myth like bonus scare over problem client lizard pioneer submit female collect" HOST=0.0.0.0 PORT=8546