From dfaec51a3b8ae06782af95fbd8cfc9be8e38e251 Mon Sep 17 00:00:00 2001 From: Sergi Delgado Segura Date: Sat, 26 Oct 2019 14:22:21 -0700 Subject: [PATCH] Updates tests to dissable logging based on 17e6066 --- test/unit/test_api.py | 4 ++-- test/unit/test_appointment.py | 3 +++ test/unit/test_blob.py | 4 ++-- test/unit/test_block_processor.py | 4 ++-- test/unit/test_carrier.py | 4 ++-- test/unit/test_cleaner.py | 4 ++-- test/unit/test_encrypted_blob.py | 4 ++-- test/unit/test_inspector.py | 6 +++--- test/unit/test_responder.py | 3 +++ test/unit/test_tools.py | 4 ++-- test/unit/test_watcher.py | 4 ++-- 11 files changed, 25 insertions(+), 19 deletions(-) diff --git a/test/unit/test_api.py b/test/unit/test_api.py index 242430e..4b259c0 100644 --- a/test/unit/test_api.py +++ b/test/unit/test_api.py @@ -5,14 +5,14 @@ from hashlib import sha256 from binascii import unhexlify from apps.cli.blob import Blob -from pisa import HOST, PORT, logging +from pisa import HOST, PORT, c_logger from test.simulator.utils import sha256d from test.simulator.transaction import TX from pisa.utils.auth_proxy import AuthServiceProxy from test.unit.conftest import generate_block, get_random_value_hex from pisa.conf import BTC_RPC_USER, BTC_RPC_PASSWD, BTC_RPC_HOST, BTC_RPC_PORT, MAX_APPOINTMENTS -logging.getLogger().disabled = True +c_logger.disabled = True PISA_API = "http://{}:{}".format(HOST, PORT) MULTIPLE_APPOINTMENTS = 10 diff --git a/test/unit/test_appointment.py b/test/unit/test_appointment.py index 92f00e6..cea47b2 100644 --- a/test/unit/test_appointment.py +++ b/test/unit/test_appointment.py @@ -1,11 +1,14 @@ import json from pytest import fixture +from pisa import c_logger from pisa.appointment import Appointment from pisa.encrypted_blob import EncryptedBlob from test.unit.conftest import get_random_value_hex +c_logger.disabled = True + # Not much to test here, adding it for completeness @fixture diff --git a/test/unit/test_blob.py b/test/unit/test_blob.py index 9bdd7d3..d8ed165 100644 --- a/test/unit/test_blob.py +++ b/test/unit/test_blob.py @@ -1,11 +1,11 @@ from binascii import unhexlify -from pisa import logging +from pisa import c_logger from apps.cli.blob import Blob from test.unit.conftest import get_random_value_hex from pisa.conf import SUPPORTED_CIPHERS, SUPPORTED_HASH_FUNCTIONS -logging.getLogger().disabled = True +c_logger.disabled = True def test_init_blob(): diff --git a/test/unit/test_block_processor.py b/test/unit/test_block_processor.py index d7d8e72..43ad8d7 100644 --- a/test/unit/test_block_processor.py +++ b/test/unit/test_block_processor.py @@ -1,13 +1,13 @@ import pytest -import logging from uuid import uuid4 from hashlib import sha256 from binascii import unhexlify +from pisa import c_logger from pisa.block_processor import BlockProcessor from test.unit.conftest import get_random_value_hex -logging.getLogger().disabled = True +c_logger.disabled = True APPOINTMENT_COUNT = 100 TEST_SET_SIZE = 200 diff --git a/test/unit/test_carrier.py b/test/unit/test_carrier.py index 595dc0c..e81606a 100644 --- a/test/unit/test_carrier.py +++ b/test/unit/test_carrier.py @@ -1,6 +1,6 @@ import pytest -import logging +from pisa import c_logger from pisa.carrier import Carrier from test.simulator.utils import sha256d from test.simulator.transaction import TX @@ -8,7 +8,7 @@ from test.unit.conftest import generate_blocks from test.unit.conftest import get_random_value_hex from pisa.rpc_errors import RPC_VERIFY_ALREADY_IN_CHAIN, RPC_DESERIALIZATION_ERROR -logging.getLogger().disabled = True +c_logger.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 diff --git a/test/unit/test_cleaner.py b/test/unit/test_cleaner.py index 27cc126..3b845bc 100644 --- a/test/unit/test_cleaner.py +++ b/test/unit/test_cleaner.py @@ -1,7 +1,7 @@ import random from uuid import uuid4 -from pisa import logging +from pisa import c_logger from pisa.responder import Job from pisa.cleaner import Cleaner from pisa.appointment import Appointment @@ -12,7 +12,7 @@ ITEMS = 10 MAX_ITEMS = 100 ITERATIONS = 1000 -logging.getLogger().disabled = True +c_logger.disabled = True def set_up_appointments(total_appointments): diff --git a/test/unit/test_encrypted_blob.py b/test/unit/test_encrypted_blob.py index f05422d..678f020 100644 --- a/test/unit/test_encrypted_blob.py +++ b/test/unit/test_encrypted_blob.py @@ -1,8 +1,8 @@ -from pisa import logging +from pisa import c_logger from pisa.encrypted_blob import EncryptedBlob from test.unit.conftest import get_random_value_hex -logging.getLogger().disabled = True +c_logger.disabled = True def test_init_encrypted_blob(): diff --git a/test/unit/test_inspector.py b/test/unit/test_inspector.py index b393614..95fcf99 100644 --- a/test/unit/test_inspector.py +++ b/test/unit/test_inspector.py @@ -1,6 +1,6 @@ from binascii import unhexlify -from pisa import logging +from pisa import c_logger from pisa.errors import * from pisa.inspector import Inspector from pisa.appointment import Appointment @@ -8,6 +8,8 @@ from pisa.block_processor import BlockProcessor from test.unit.conftest import get_random_value_hex from pisa.conf import MIN_DISPUTE_DELTA, SUPPORTED_CIPHERS, SUPPORTED_HASH_FUNCTIONS +c_logger.disabled = True + inspector = Inspector() APPOINTMENT_OK = (0, None) @@ -15,8 +17,6 @@ NO_HEX_STRINGS = ["R" * 64, get_random_value_hex(31) + "PP", "$"*64, " "*64] WRONG_TYPES = [[], '', get_random_value_hex(32), 3.2, 2.0, (), object, {}, " "*32, object()] WRONG_TYPES_NO_STR = [[], unhexlify(get_random_value_hex(32)), 3.2, 2.0, (), object, {}, object()] -logging.getLogger().disabled = True - def test_check_locator(): # Right appointment type, size and format diff --git a/test/unit/test_responder.py b/test/unit/test_responder.py index 2a38c7e..ae1e967 100644 --- a/test/unit/test_responder.py +++ b/test/unit/test_responder.py @@ -4,6 +4,7 @@ from uuid import uuid4 from threading import Thread from queue import Queue, Empty +from pisa import c_logger from pisa.tools import check_txid_format from test.simulator.utils import sha256d from pisa.responder import Responder, Job @@ -13,6 +14,8 @@ from test.unit.conftest import get_random_value_hex from test.unit.conftest import generate_block, generate_blocks from pisa.conf import BTC_RPC_USER, BTC_RPC_PASSWD, BTC_RPC_HOST, BTC_RPC_PORT +c_logger.disabled = True + @pytest.fixture(scope="module") def responder(db_manager): diff --git a/test/unit/test_tools.py b/test/unit/test_tools.py index f9bdca2..8b706ed 100644 --- a/test/unit/test_tools.py +++ b/test/unit/test_tools.py @@ -1,8 +1,8 @@ -from pisa import logging +from pisa import c_logger from pisa.tools import check_txid_format from pisa.tools import can_connect_to_bitcoind, in_correct_network, bitcoin_cli -logging.getLogger().disabled = True +c_logger.disabled = True def test_in_correct_network(run_bitcoind): diff --git a/test/unit/test_watcher.py b/test/unit/test_watcher.py index 0d95956..1d082c3 100644 --- a/test/unit/test_watcher.py +++ b/test/unit/test_watcher.py @@ -1,5 +1,4 @@ import pytest -import logging from uuid import uuid4 from hashlib import sha256 from threading import Thread @@ -12,6 +11,7 @@ from cryptography.hazmat.primitives.serialization import load_pem_private_key from cryptography.hazmat.primitives.asymmetric import ec from cryptography.exceptions import InvalidSignature +from pisa import c_logger from apps.cli.blob import Blob from pisa.watcher import Watcher from pisa.responder import Responder @@ -24,7 +24,7 @@ from pisa.utils.auth_proxy import AuthServiceProxy from test.unit.conftest import generate_block, generate_blocks from pisa.conf import EXPIRY_DELTA, BTC_RPC_USER, BTC_RPC_PASSWD, BTC_RPC_HOST, BTC_RPC_PORT, PISA_SECRET_KEY -logging.getLogger().disabled = True +c_logger.disabled = True APPOINTMENTS = 5 START_TIME_OFFSET = 1