Updates tests to be pytests friedly

pytests already runs all the test_ functions, so there's no need to call them
This commit is contained in:
Sergi Delgado Segura
2019-10-08 18:57:29 +01:00
parent 9a18f759f9
commit fa5f587134
3 changed files with 17 additions and 27 deletions

View File

@@ -4,6 +4,8 @@ from pisa import logging
from apps.cli.blob import Blob from apps.cli.blob import Blob
from pisa.conf import SUPPORTED_CIPHERS, SUPPORTED_HASH_FUNCTIONS from pisa.conf import SUPPORTED_CIPHERS, SUPPORTED_HASH_FUNCTIONS
logging.getLogger().disabled = True
def test_init_blob(): def test_init_blob():
data = urandom(64).hex() data = urandom(64).hex()
@@ -87,8 +89,3 @@ def test_encrypt():
assert(encrypted_blob == encrypted_blob2 and id(encrypted_blob) != id(encrypted_blob2)) assert(encrypted_blob == encrypted_blob2 and id(encrypted_blob) != id(encrypted_blob2))
logging.getLogger().disabled = True
test_init_blob()
test_encrypt()

View File

@@ -12,6 +12,8 @@ ITEMS = 10
MAX_ITEMS = 100 MAX_ITEMS = 100
ITERATIONS = 1000 ITERATIONS = 1000
logging.getLogger().disabled = True
def set_up_appointments(total_appointments): def set_up_appointments(total_appointments):
appointments = dict() appointments = dict()
@@ -57,6 +59,7 @@ def set_up_jobs(total_jobs):
def test_delete_expired_appointment(): def test_delete_expired_appointment():
for _ in range(ITERATIONS):
appointments, locator_uuid_map = set_up_appointments(MAX_ITEMS) appointments, locator_uuid_map = set_up_appointments(MAX_ITEMS)
expired_appointments = random.sample(list(appointments.keys()), k=ITEMS) expired_appointments = random.sample(list(appointments.keys()), k=ITEMS)
@@ -66,6 +69,7 @@ def test_delete_expired_appointment():
def test_delete_completed_jobs(): def test_delete_completed_jobs():
for _ in range(ITERATIONS):
jobs, tx_job_map = set_up_jobs(MAX_ITEMS) jobs, tx_job_map = set_up_jobs(MAX_ITEMS)
selected_jobs = random.sample(list(jobs.keys()), k=ITEMS) selected_jobs = random.sample(list(jobs.keys()), k=ITEMS)
@@ -75,12 +79,3 @@ def test_delete_completed_jobs():
assert not set(completed_jobs).issubset(jobs.keys()) 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()

View File

@@ -4,6 +4,8 @@ from cryptography.exceptions import InvalidTag
from pisa import logging from pisa import logging
from pisa.encrypted_blob import EncryptedBlob from pisa.encrypted_blob import EncryptedBlob
logging.getLogger().disabled = True
def test_init_encrypted_blob(): def test_init_encrypted_blob():
# No much to test here, basically that the object is properly created # 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) assert(encrypted_blob.decrypt(key) == data)
logging.getLogger().disabled = True
test_init_encrypted_blob()
test_decrypt()