From fa5f587134c42652f2e71e9cdee5d65c29ab38d0 Mon Sep 17 00:00:00 2001 From: Sergi Delgado Segura Date: Tue, 8 Oct 2019 18:57:29 +0100 Subject: [PATCH] Updates tests to be pytests friedly pytests already runs all the test_ functions, so there's no need to call them --- test/unit/test_blob.py | 7 ++----- test/unit/test_cleaner.py | 31 +++++++++++++------------------ test/unit/test_encrypted_blob.py | 6 ++---- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/test/unit/test_blob.py b/test/unit/test_blob.py index fc95450..efd9e1a 100644 --- a/test/unit/test_blob.py +++ b/test/unit/test_blob.py @@ -4,6 +4,8 @@ from pisa import logging from apps.cli.blob import Blob from pisa.conf import SUPPORTED_CIPHERS, SUPPORTED_HASH_FUNCTIONS +logging.getLogger().disabled = True + def test_init_blob(): data = urandom(64).hex() @@ -87,8 +89,3 @@ def test_encrypt(): assert(encrypted_blob == encrypted_blob2 and id(encrypted_blob) != id(encrypted_blob2)) -logging.getLogger().disabled = True - -test_init_blob() -test_encrypt() - diff --git a/test/unit/test_cleaner.py b/test/unit/test_cleaner.py index 5308ca6..5206118 100644 --- a/test/unit/test_cleaner.py +++ b/test/unit/test_cleaner.py @@ -12,6 +12,8 @@ ITEMS = 10 MAX_ITEMS = 100 ITERATIONS = 1000 +logging.getLogger().disabled = True + def set_up_appointments(total_appointments): appointments = dict() @@ -57,30 +59,23 @@ def set_up_jobs(total_jobs): def test_delete_expired_appointment(): - appointments, locator_uuid_map = set_up_appointments(MAX_ITEMS) - expired_appointments = random.sample(list(appointments.keys()), k=ITEMS) + for _ in range(ITERATIONS): + appointments, locator_uuid_map = set_up_appointments(MAX_ITEMS) + expired_appointments = random.sample(list(appointments.keys()), k=ITEMS) - Cleaner.delete_expired_appointment(expired_appointments, appointments, locator_uuid_map) + Cleaner.delete_expired_appointment(expired_appointments, appointments, locator_uuid_map) - assert not set(expired_appointments).issubset(appointments.keys()) + assert not set(expired_appointments).issubset(appointments.keys()) def test_delete_completed_jobs(): - jobs, tx_job_map = set_up_jobs(MAX_ITEMS) - selected_jobs = random.sample(list(jobs.keys()), k=ITEMS) + for _ in range(ITERATIONS): + jobs, tx_job_map = set_up_jobs(MAX_ITEMS) + selected_jobs = random.sample(list(jobs.keys()), k=ITEMS) - completed_jobs = [(job, 6) for job in selected_jobs] + completed_jobs = [(job, 6) for job in selected_jobs] - Cleaner.delete_completed_jobs(jobs, tx_job_map, completed_jobs, 0) + Cleaner.delete_completed_jobs(jobs, tx_job_map, completed_jobs, 0) - assert not set(completed_jobs).issubset(jobs.keys()) - - -logging.getLogger().disabled = True - -for _ in range(ITERATIONS): - test_delete_expired_appointment() - -for _ in range(ITERATIONS): - test_delete_completed_jobs() + assert not set(completed_jobs).issubset(jobs.keys()) diff --git a/test/unit/test_encrypted_blob.py b/test/unit/test_encrypted_blob.py index 58ddd09..096c316 100644 --- a/test/unit/test_encrypted_blob.py +++ b/test/unit/test_encrypted_blob.py @@ -4,6 +4,8 @@ from cryptography.exceptions import InvalidTag from pisa import logging from pisa.encrypted_blob import EncryptedBlob +logging.getLogger().disabled = True + def test_init_encrypted_blob(): # No much to test here, basically that the object is properly created @@ -34,8 +36,4 @@ def test_decrypt(): assert(encrypted_blob.decrypt(key) == data) -logging.getLogger().disabled = True - -test_init_encrypted_blob() -test_decrypt()