From 68cd209e1bcd7c613fca3b33fed0bd2da0c5a87e Mon Sep 17 00:00:00 2001 From: Florin Barbu Date: Tue, 21 May 2024 14:07:33 +0300 Subject: [PATCH] fixes --- src/test_data.py | 15 --------------- tests/store/test_time_filter.py | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/test_data.py b/src/test_data.py index b0a62928..bf52edd2 100644 --- a/src/test_data.py +++ b/src/test_data.py @@ -149,19 +149,4 @@ SAMPLE_TIMESTAMPS = [ {"description": "Missing", "value": None, "valid_for": ["gowaku"]}, ] - -STORE_TIMESTAMPS_PASS = [ - {"description": "3 sec Past", "value": int((datetime.now() - timedelta(seconds=3)).timestamp() * 1e9)}, - {"description": "1 sec Past", "value": int((datetime.now() - timedelta(seconds=1)).timestamp() * 1e9)}, - {"description": "0.1 sec Past", "value": int((datetime.now() - timedelta(seconds=0.1)).timestamp() * 1e9)}, - {"description": "0.1 sec Future", "value": int((datetime.now() + timedelta(seconds=0.1)).timestamp() * 1e9)}, - {"description": "2 sec Future", "value": int((datetime.now() + timedelta(seconds=2)).timestamp() * 1e9)}, - {"description": "10 sec Future", "value": int((datetime.now() + timedelta(seconds=10)).timestamp() * 1e9)}, -] - -STORE_TIMESTAMPS_FAIL = [ - {"description": "20 sec Past", "value": int((datetime.now() - timedelta(seconds=20)).timestamp() * 1e9)}, - {"description": "40 sec Future", "value": int((datetime.now() + timedelta(seconds=40)).timestamp() * 1e9)}, -] - PUBSUB_TOPICS_RLN = ["/waku/2/rs/1/0"] diff --git a/tests/store/test_time_filter.py b/tests/store/test_time_filter.py index 429e2a0b..9daf9bd8 100644 --- a/tests/store/test_time_filter.py +++ b/tests/store/test_time_filter.py @@ -2,7 +2,6 @@ import pytest from datetime import timedelta, datetime from src.libs.custom_logger import get_custom_logger from src.steps.store import StepsStore -from src.test_data import STORE_TIMESTAMPS_PASS, STORE_TIMESTAMPS_FAIL logger = get_custom_logger(__name__) @@ -13,8 +12,16 @@ logger = get_custom_logger(__name__) @pytest.mark.usefixtures("node_setup") class TestTimeFilter(StepsStore): def test_messages_with_timestamps_close_to_now(self): + ts = [ + {"description": "3 sec Past", "value": int((datetime.now() - timedelta(seconds=3)).timestamp() * 1e9)}, + {"description": "1 sec Past", "value": int((datetime.now() - timedelta(seconds=1)).timestamp() * 1e9)}, + {"description": "0.1 sec Past", "value": int((datetime.now() - timedelta(seconds=0.1)).timestamp() * 1e9)}, + {"description": "0.1 sec Future", "value": int((datetime.now() + timedelta(seconds=0.1)).timestamp() * 1e9)}, + {"description": "2 sec Future", "value": int((datetime.now() + timedelta(seconds=2)).timestamp() * 1e9)}, + {"description": "10 sec Future", "value": int((datetime.now() + timedelta(seconds=10)).timestamp() * 1e9)}, + ] failed_timestamps = [] - for timestamp in STORE_TIMESTAMPS_PASS: + for timestamp in ts: logger.debug(f'Running test with payload {timestamp["description"]}') message = self.create_message(timestamp=timestamp["value"]) try: @@ -27,7 +34,11 @@ class TestTimeFilter(StepsStore): def test_messages_with_timestamps_far_from_now(self): success_timestamps = [] - for timestamp in STORE_TIMESTAMPS_FAIL: + ts = [ + {"description": "20 sec Past", "value": int((datetime.now() - timedelta(seconds=20)).timestamp() * 1e9)}, + {"description": "40 sec Future", "value": int((datetime.now() + timedelta(seconds=40)).timestamp() * 1e9)}, + ] + for timestamp in ts: logger.debug(f'Running test with payload {timestamp["description"]}') message = self.create_message(timestamp=timestamp["value"]) try: