diff --git a/src/steps/common.py b/src/steps/common.py index 2ba7c8a..dcd593a 100644 --- a/src/steps/common.py +++ b/src/steps/common.py @@ -5,6 +5,7 @@ import shutil import pytest from src.env_vars import CFGSYNC, NOMOS, NOMOS_EXECUTOR +from src.libs.common import delay from src.libs.custom_logger import get_custom_logger from src.node.nomos_node import NomosNode @@ -65,6 +66,8 @@ class StepsCommon: logger.error(f"REST service did not become ready in time: {ex}") raise + delay(5) + @pytest.fixture(scope="function") def setup_4_node_cluster(self, request): logger.debug(f"Running fixture setup: {inspect.currentframe().f_code.co_name}") @@ -82,3 +85,5 @@ class StepsCommon: except Exception as ex: logger.error(f"REST service did not become ready in time: {ex}") raise + + delay(5) diff --git a/tests/data_integrity/test_data_integrity.py b/tests/data_integrity/test_data_integrity.py index 9e5ed9c..e68544d 100644 --- a/tests/data_integrity/test_data_integrity.py +++ b/tests/data_integrity/test_data_integrity.py @@ -17,7 +17,6 @@ class TestDataIntegrity(StepsDataAvailability): @pytest.mark.usefixtures("setup_4_node_cluster") def test_da_identify_retrieve_missing_columns(self): - delay(5) self.disperse_data(DATA_TO_DISPERSE[1], to_app_id(1), to_index(0)) delay(5) # Select one target node at random to get blob data for 1/2 columns @@ -31,7 +30,6 @@ class TestDataIntegrity(StepsDataAvailability): @pytest.mark.usefixtures("setup_2_node_cluster") def test_da_sampling_determines_data_presence(self): - delay(5) self.disperse_data(DATA_TO_DISPERSE[1], to_app_id(1), to_index(0)) delay(5) rcv_data = self.get_data_range(self.node2, to_app_id(1), to_index(0), to_index(5)) diff --git a/tests/e2e/test_2node_alive.py b/tests/e2e/test_2node_alive.py index fbf87d9..e6137e4 100644 --- a/tests/e2e/test_2node_alive.py +++ b/tests/e2e/test_2node_alive.py @@ -1,8 +1,6 @@ import pytest -from src.env_vars import CFGSYNC, NOMOS, NOMOS_EXECUTOR from src.libs.custom_logger import get_custom_logger -from src.node.nomos_node import NomosNode from src.steps.common import StepsCommon logger = get_custom_logger(__name__) diff --git a/tests/networking_privacy/test_networking_privacy.py b/tests/networking_privacy/test_networking_privacy.py index 396a69a..9b85ee7 100644 --- a/tests/networking_privacy/test_networking_privacy.py +++ b/tests/networking_privacy/test_networking_privacy.py @@ -14,7 +14,6 @@ class TestNetworkingPrivacy(StepsDataAvailability): @pytest.mark.usefixtures("setup_2_node_cluster") def test_consumed_bandwidth_dispersal(self, setup_2_node_cluster): - delay(5) net_io = psutil.net_io_counters() prev_total = net_io.bytes_sent + net_io.bytes_recv @@ -45,7 +44,6 @@ class TestNetworkingPrivacy(StepsDataAvailability): @pytest.mark.usefixtures("setup_2_node_cluster") def test_consumed_bandwidth_random_data_dispersal(self): - delay(5) net_io = psutil.net_io_counters() prev_total = net_io.bytes_sent + net_io.bytes_recv