Browse Source

fail on virtualenv setup, fix cov test run on travis

master
fivepiece 8 years ago
parent
commit
f3e321a7dd
  1. 5
      install.sh
  2. 2
      test/run_tests.sh

5
install.sh

@ -58,8 +58,8 @@ venv_setup ()
return 0
fi
rm -rf "${jm_source}/deps"
virtualenv -p python2 "${jm_source}/jmvenv"
source "${jm_source}/jmvenv/bin/activate"
virtualenv -p python2 "${jm_source}/jmvenv" || return 1
source "${jm_source}/jmvenv/bin/activate" || return 1
pip install --upgrade pip
pip install --upgrade setuptools
deactivate
@ -276,6 +276,7 @@ main ()
fi
if ! venv_setup; then
echo "Joinmarket virtualenv could not be setup. Exiting."
return 1
fi
source "${jm_root}/bin/activate"
mkdir -p deps

2
test/run_tests.sh

@ -45,7 +45,7 @@ run_jm_tests ()
cp -f ./test/bitcoin.conf "${jm_test_datadir}/bitcoin.conf"
${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 --ignore jmclient/test/test_wallets.py --ignore test/test_segwit.py
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 --ignore jmclient/test/test_wallets.py --ignore test/test_segwit.py
unlink ./joinmarket.cfg
if read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then
pkill -15 ${bitcoind_pid} || pkill -9 ${bitcoind_pid}

Loading…
Cancel
Save