diff --git a/test/unit/conftest.py b/test/unit/conftest.py index 361e99f..61f9567 100644 --- a/test/unit/conftest.py +++ b/test/unit/conftest.py @@ -9,10 +9,10 @@ from test.simulator.bitcoind_sim import run_simulator bitcoind_process = Process(target=run_simulator) -@pytest.fixture(autouse=True, scope='session') +@pytest.fixture(scope='session') def run_bitcoind(): global bitcoind_process - + bitcoind_process.daemon = True bitcoind_process.start() @@ -20,7 +20,7 @@ def run_bitcoind(): sleep(0.1) -@pytest.fixture(autouse=True, scope='session') +@pytest.fixture(scope='session') def run_api(): api_thread = Thread(target=start_api) api_thread.daemon = True diff --git a/test/unit/test_api.py b/test/unit/test_api.py index 6027a55..8a5661d 100644 --- a/test/unit/test_api.py +++ b/test/unit/test_api.py @@ -70,7 +70,7 @@ def add_appointment(appointment): return r -def test_add_appointment(new_appointment): +def test_add_appointment(run_api, run_bitcoind, new_appointment): # Properly formatted appointment r = add_appointment(new_appointment) assert (r.status_code == 200) diff --git a/test/unit/test_block_processor.py b/test/unit/test_block_processor.py index facf6b7..a0ec37f 100644 --- a/test/unit/test_block_processor.py +++ b/test/unit/test_block_processor.py @@ -1,4 +1,5 @@ import pytest +import logging from os import urandom from uuid import uuid4 from hashlib import sha256 @@ -6,6 +7,8 @@ from binascii import unhexlify from pisa.block_processor import BlockProcessor +logging.getLogger().disabled = True + APPOINTMENT_COUNT = 100 TEST_SET_SIZE = 200 @@ -25,7 +28,7 @@ def best_block_hash(): return BlockProcessor.get_best_block_hash() -def test_get_best_block_hash(best_block_hash): +def test_get_best_block_hash(run_bitcoind, best_block_hash): # As long as bitcoind is running (or mocked in this case) we should always a block hash assert best_block_hash is not None and isinstance(best_block_hash, str) diff --git a/test/unit/test_carrier.py b/test/unit/test_carrier.py index 8c71e67..374dd24 100644 --- a/test/unit/test_carrier.py +++ b/test/unit/test_carrier.py @@ -1,4 +1,5 @@ import pytest +import logging from os import urandom from time import sleep @@ -6,6 +7,8 @@ from pisa.carrier import Carrier from pisa.rpc_errors import RPC_VERIFY_ALREADY_IN_CHAIN, RPC_DESERIALIZATION_ERROR from test.simulator.bitcoind_sim import TIME_BETWEEN_BLOCKS +logging.getLogger().disabled = True + # FIXME: This test do not fully cover the carrier since the simulator does not support every single error bitcoind may # return for RPC_VERIFY_REJECTED and RPC_VERIFY_ERROR. Further development of the simulator / mocks or simulation # with bitcoind is required @@ -19,7 +22,7 @@ def carrier(): return Carrier() -def test_send_transaction(carrier): +def test_send_transaction(run_bitcoind, carrier): # We are mocking bitcoind and in our simulator txid == tx tx = urandom(32).hex() receipt = carrier.send_transaction(tx, tx) diff --git a/test/unit/test_inspector.py b/test/unit/test_inspector.py index 4bed6c5..bed6a9a 100644 --- a/test/unit/test_inspector.py +++ b/test/unit/test_inspector.py @@ -188,7 +188,7 @@ def test_check_hash_function(): assert (Inspector.check_hash_function(hash_function)[0] == APPOINTMENT_EMPTY_FIELD) -def test_inspect(): +def test_inspect(run_bitcoind): # At this point every single check function has been already tested, let's test inspect with an invalid and a valid # appointments. diff --git a/test/unit/test_tools.py b/test/unit/test_tools.py index 25516b3..9953889 100644 --- a/test/unit/test_tools.py +++ b/test/unit/test_tools.py @@ -6,7 +6,7 @@ from pisa.tools import can_connect_to_bitcoind, in_correct_network logging.getLogger().disabled = True -def test_in_correct_network(): +def test_in_correct_network(run_bitcoind): # The simulator runs as if it was regtest, so every other network should fail assert in_correct_network('mainnet') is False assert in_correct_network('testnet') is False