fix: multiple class inheritance for TestRelayRLN

This commit is contained in:
Roman 2024-04-24 17:13:10 +08:00
parent 776828c5a3
commit 285a652da8
No known key found for this signature in database
GPG Key ID: B8FE070B54E11B75
2 changed files with 4 additions and 24 deletions

View File

@ -83,27 +83,6 @@ class StepsRLN(StepsCommon):
sender.send_relay_message(message, pubsub_topic)
@allure.step
def check_published_message_reaches_relay_peer(self, message=None, pubsub_topic=None, message_propagation_delay=0.1, sender=None, peer_list=None):
if message is None:
message = self.create_message()
if pubsub_topic is None:
pubsub_topic = self.test_pubsub_topic
if not sender:
sender = self.node1
if not peer_list:
peer_list = self.main_nodes + self.optional_nodes
sender.send_relay_message(message, pubsub_topic)
delay(message_propagation_delay)
for index, peer in enumerate(peer_list):
logger.debug(f"Checking that peer NODE_{index + 1}:{peer.image} can find the published message")
get_messages_response = peer.get_relay_messages(pubsub_topic)
assert get_messages_response, f"Peer NODE_{index + 1}:{peer.image} couldn't find any messages"
assert len(get_messages_response) == 1, f"Expected 1 message but got {len(get_messages_response)}"
waku_message = WakuMessage(get_messages_response)
waku_message.assert_received_message(message)
@allure.step
def ensure_relay_subscriptions_on_nodes(self, node_list, pubsub_topic_list):
for node in node_list:

View File

@ -4,6 +4,7 @@ from time import time
import pytest
from src.libs.common import delay, to_base64
from src.libs.custom_logger import get_custom_logger
from src.steps.relay import StepsRelay
from src.steps.rln import StepsRLN
from src.test_data import SAMPLE_INPUTS
@ -11,7 +12,7 @@ logger = get_custom_logger(__name__)
@pytest.mark.usefixtures("register_main_rln_relay_nodes")
class TestRelayRLN(StepsRLN):
class TestRelayRLN(StepsRLN, StepsRelay):
def test_publish_with_valid_payloads_at_slow_rate(self):
self.setup_main_rln_relay_nodes()
self.subscribe_main_relay_nodes()
@ -104,7 +105,7 @@ class TestRelayRLN(StepsRLN):
self.setup_main_rln_relay_nodes(rln_relay_dynamic="true")
self.subscribe_main_relay_nodes()
failed_payloads = []
for payload in SAMPLE_INPUTS[:5]:
for payload in SAMPLE_INPUTS:
logger.debug(f'Running test with payload {payload["description"]}')
message = self.create_message(payload=to_base64(payload["value"]))
try:
@ -120,7 +121,7 @@ class TestRelayRLN(StepsRLN):
self.setup_main_rln_relay_nodes(rln_relay_dynamic="true")
self.subscribe_main_relay_nodes()
previous = math.trunc(time())
for i, payload in enumerate(SAMPLE_INPUTS[:4]):
for i, payload in enumerate(SAMPLE_INPUTS):
logger.debug(f'Running test with payload {payload["description"]}')
message = self.create_message(payload=to_base64(payload["value"]))
try: