Browse Source

Merge #87: return pytest return value in run_tests.sh

f2cc367 return pytest return value in run_tests.sh (fivepiece)
master
AdamISZ 8 years ago
parent
commit
ee4b389210
No known key found for this signature in database
GPG Key ID: B3AE09F1E9A3197A
  1. 2
      test/run_tests.sh

2
test/run_tests.sh

@ -46,10 +46,12 @@ run_jm_tests ()
${orig_umask}
echo "datadir=${jm_test_datadir}" >> "${jm_test_datadir}/bitcoin.conf"
python -m py.test ${HAS_JOSH_K_SEAL_OF_APPROVAL+--cov=jmclient --cov=jmbitcoin --cov=jmbase --cov=jmdaemon --cov-report html} --btcpwd=123456abcdef --btcconf=${jm_test_datadir}/bitcoin.conf --btcuser=bitcoinrpc --nirc=2 -p no:warnings
local success="$?"
unlink ./joinmarket.cfg
if read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then
pkill -15 ${bitcoind_pid} || pkill -9 ${bitcoind_pid}
fi
rm -rf "${jm_test_datadir}"
return ${success:-1}
}
run_jm_tests

Loading…
Cancel
Save