From 7b5a127f142f4d5a119853cc16d17496592b8284 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sun, 21 Apr 2019 19:50:16 +0300 Subject: [PATCH 1/2] Avoid "no such file or directory" error --- test/run_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/run_tests.sh b/test/run_tests.sh index a8c2c77..7ee1255 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -63,7 +63,7 @@ run_jm_tests () python -m pytest ${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 --ignore test/test_full_coinjoin.py local success="$?" unlink ./joinmarket.cfg - if read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then + if [ -f "${jm_test_datadir}/bitcoind.pid" ] && read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then kill -15 ${bitcoind_pid} || kill -9 ${bitcoind_pid} fi if [[ "${HAS_JOSH_K_SEAL_OF_APPROVAL}" == true ]] && (( ${success} != 0 )); then From 0385a5b7fd4ab9d4f8e1ec5d2417981b07281870 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sun, 21 Apr 2019 19:55:00 +0300 Subject: [PATCH 2/2] Metion bitcoind 0.17+ requirement in docs Payjoin tests fail on 0.16. --- docs/TESTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/TESTING.md b/docs/TESTING.md index 3ab761c..8720126 100644 --- a/docs/TESTING.md +++ b/docs/TESTING.md @@ -2,7 +2,7 @@ This is a rough sketch, some more background is found in [JM wiki](https://github.com/Joinmarket-Org/joinmarket/wiki/Testing) -Make sure to have [bitcoind](https://bitcoin.org/en/full-node) installed. Also need miniircd installed to the root (i.e. in your `joinmarket-clientserver` directory): +Make sure to have [bitcoind](https://bitcoin.org/en/full-node) 0.17 or newer installed. Also need miniircd installed to the root (i.e. in your `joinmarket-clientserver` directory): cd ~/joinmarket-clientserver git clone https://github.com/Joinmarket-Org/miniircd