Skip to content

Commit 869118d

Browse files
committed
chore: remove await_signals from tests
1 parent 75b702e commit 869118d

19 files changed

+43
-179
lines changed

tests-functional/clients/status_backend.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
class StatusBackend(RpcClient, SignalClient, ApiClient):
4040
container = None
4141

42-
def __init__(self, await_signals=[], privileged=False, ipv6=USE_IPV6, **kwargs):
42+
def __init__(self, privileged=False, ipv6=USE_IPV6, **kwargs):
4343
self.temp_dir = None
4444
self.ipv6 = True if ipv6 == "Yes" else False
4545
logging.debug(f"Flag USE_IPV6 is: {self.ipv6}")
@@ -83,7 +83,7 @@ def __init__(self, await_signals=[], privileged=False, ipv6=USE_IPV6, **kwargs):
8383

8484
RpcClient.__init__(self)
8585
ApiClient.__init__(self, self.api_url)
86-
SignalClient.__init__(self, self.ws_url, await_signals)
86+
SignalClient.__init__(self, self.ws_url)
8787

8888
self.wait_for_healthy()
8989

tests-functional/steps/messenger.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@
1515

1616
class MessengerSteps(NetworkConditionsSteps):
1717

18-
await_signals = [
19-
SignalType.MESSAGES_NEW.value,
20-
SignalType.MESSAGE_DELIVERED.value,
21-
SignalType.NODE_LOGIN.value,
22-
SignalType.NODE_STOPPED.value,
23-
]
24-
2518
def send_contact_request_and_wait_for_signal_to_be_received(self, sender=None, receiver=None) -> str:
2619
"""
2720
Send a contact request from sender to receiver and wait for confirmation.

tests-functional/tests/benchmark/test_basic_benchmark.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import pytest
22
import time
33

4-
from clients.signals import SignalType
54
from clients.status_backend import StatusBackend
65
from utils.config import Config
76
from steps.messenger import MessengerSteps
@@ -15,13 +14,6 @@ class TestBasicBenchmark(MessengerSteps):
1514
This test suite contains a few test cases that track CPU, RAM and network usage via Docker API.
1615
"""
1716

18-
await_signals = [
19-
SignalType.MESSAGES_NEW.value,
20-
SignalType.MESSAGE_DELIVERED.value,
21-
SignalType.NODE_LOGIN.value,
22-
SignalType.NODE_STOPPED.value,
23-
]
24-
2517
@pytest.fixture(scope="function", autouse=False)
2618
def aut(self, request, backend_factory, waku_light_client):
2719
"""Creates a AUT (Application Under Test) - a StatusBackend instance initialized for performance testing."""

tests-functional/tests/conftest.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ def test_with_params(self, backend_factory):
3030
self.receiver = backend_factory("receiver")
3131
"""
3232

33-
# Get class-level configuration
34-
await_signals = getattr(request.cls, "await_signals", ["messages.new", "message.delivered", "node.login", "node.logout"])
35-
3633
# Get parameters from request.param if available
3734
params = getattr(request, "param", {})
3835

@@ -61,7 +58,7 @@ def factory(name, **kwargs) -> StatusBackend:
6158
logging.debug(f"📋 [SETUP] Parameters: privileged={privileged}, ipv6={ipv6}")
6259

6360
# Create backend
64-
backend = StatusBackend(await_signals=await_signals, privileged=privileged, ipv6=ipv6, **kwargs)
61+
backend = StatusBackend(privileged=privileged, ipv6=ipv6, **kwargs)
6562
created_backends.append(backend)
6663
logging.debug(f"✅ [SETUP] {name.capitalize()} backend created")
6764

tests-functional/tests/test_backup_mnemonic_and_restore.py

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,14 @@
1414
@pytest.mark.rpc
1515
class TestBackupMnemonicAndRestore:
1616

17-
await_signals = [
18-
SignalType.MEDIASERVER_STARTED.value,
19-
SignalType.NODE_STARTED.value,
20-
SignalType.NODE_READY.value,
21-
SignalType.NODE_LOGIN.value,
22-
SignalType.NODE_STOPPED.value,
23-
]
24-
2517
@pytest.fixture(autouse=True)
2618
def setup_cleanup(self, close_status_backend_containers):
2719
"""Automatically cleanup containers after each test"""
2820
yield
2921

3022
def test_profile_creation_and_mnemonics_backup(self):
3123
# Create a new account container and initialize
32-
account = StatusBackend(self.await_signals)
24+
account = StatusBackend()
3325
account.init_status_backend()
3426
account.create_account_and_login()
3527
account.wait_for_login()
@@ -43,7 +35,7 @@ def test_profile_creation_and_mnemonics_backup(self):
4335

4436
def test_backup_account_and_restore_it_via_mnemonics(self):
4537
# Create original account and backup mnemonic
46-
original_account = StatusBackend(self.await_signals)
38+
original_account = StatusBackend()
4739
original_account.init_status_backend()
4840
original_account.create_account_and_login()
4941
original_account.wait_for_login()
@@ -56,7 +48,7 @@ def test_backup_account_and_restore_it_via_mnemonics(self):
5648
user.passphrase = mnemonic
5749

5850
# Restore account in a new container
59-
restored_account = StatusBackend(self.await_signals)
51+
restored_account = StatusBackend()
6052
restored_account.init_status_backend()
6153
restored_account.restore_account_and_login(user=user)
6254
restored_account.wait_for_login()
@@ -90,7 +82,7 @@ def test_backup_account_and_restore_it_via_mnemonics(self):
9082
)
9183
def test_restore_app_different_valid_size_mnemonics(self, user_mnemonic):
9284
# Initialize backend client and restore account using user_mnemonic.
93-
restored_account = StatusBackend(self.await_signals)
85+
restored_account = StatusBackend()
9486
restored_account.init_status_backend()
9587
restored_account.restore_account_and_login(user=user_mnemonic)
9688
restored_account.wait_for_login()
@@ -116,7 +108,7 @@ def test_restore_with_arbitrary_size_mnemonics(self, mnemonic_size):
116108
user = copy.deepcopy(user_mnemonic_12)
117109
user.passphrase = " ".join("".join(random.choice(string.ascii_lowercase) for _ in range(random.randint(2, 10))) for _ in range(mnemonic_size))
118110

119-
restored_account = StatusBackend(self.await_signals)
111+
restored_account = StatusBackend()
120112
restored_account.init_status_backend()
121113
restored_account.restore_account_and_login(user=user)
122114
restored_account.wait_for_login()
@@ -131,7 +123,7 @@ def test_restore_with_mnemonic_with_special_chars(self):
131123
user = copy.deepcopy(user_mnemonic_12)
132124
user.passphrase = "<>?`~!@#$%^&*()_+1 $fgdg ^&*()"
133125

134-
restored_account = StatusBackend(self.await_signals)
126+
restored_account = StatusBackend()
135127
restored_account.init_status_backend()
136128
restored_account.restore_account_and_login(user=user)
137129
restored_account.wait_for_login()
@@ -144,7 +136,7 @@ def test_restore_with_empty_mnemonic(self):
144136
# Restore with empty mnemonic isn't allowed
145137
user = copy.deepcopy(user_mnemonic_12)
146138

147-
restored_account = StatusBackend(self.await_signals)
139+
restored_account = StatusBackend()
148140
restored_account.init_status_backend()
149141
restored_account._set_display_name()
150142
data = restored_account._create_account_request(user)
@@ -155,7 +147,7 @@ def test_restore_with_empty_mnemonic(self):
155147
def test_restore_with_both_mnemonic_and_keycard(self):
156148
# Restore with both keycard and mnemonic isn't allowed
157149
user = copy.deepcopy(user_mnemonic_12)
158-
restored_account = StatusBackend(self.await_signals)
150+
restored_account = StatusBackend()
159151
restored_account.init_status_backend()
160152
restored_account._set_display_name()
161153
data = restored_account._create_account_request(user)
@@ -166,7 +158,7 @@ def test_restore_with_both_mnemonic_and_keycard(self):
166158

167159
def test_restored_on_existing_restored_account_fails(self):
168160
user = copy.deepcopy(user_mnemonic_12)
169-
restored_account = StatusBackend(self.await_signals)
161+
restored_account = StatusBackend()
170162
restored_account.init_status_backend()
171163
restored_account.restore_account_and_login(user=user)
172164
restored_account.wait_for_login()

tests-functional/tests/test_edit_community.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,6 @@ def validate_community_images(community, name, cert_file_path):
4848
@pytest.mark.rpc
4949
@pytest.mark.create_account
5050
class TestEditCommunity:
51-
await_signals = [
52-
SignalType.MEDIASERVER_STARTED.value,
53-
SignalType.NODE_STARTED.value,
54-
SignalType.NODE_READY.value,
55-
SignalType.NODE_LOGIN.value,
56-
]
5751

5852
@pytest.fixture()
5953
def backend(self, backend_new_profile) -> StatusBackend:

tests-functional/tests/test_eth_api.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
import pytest
22

3-
from clients.signals import SignalType
43
from resources.constants import user_1, user_2
54

65

76
@pytest.mark.rpc
87
@pytest.mark.ethclient
98
@pytest.mark.xdist_group(name="Eth")
109
class TestEth:
11-
await_signals = [
12-
SignalType.NODE_LOGIN.value,
13-
SignalType.WALLET.value,
14-
SignalType.WALLET_SUGGESTED_ROUTES.value,
15-
SignalType.WALLET_ROUTER_SIGN_TRANSACTIONS.value,
16-
SignalType.WALLET_ROUTER_SENDING_TRANSACTIONS_STARTED.value,
17-
SignalType.WALLET_ROUTER_TRANSACTIONS_SENT.value,
18-
]
1910

2011
def test_estimate_gas(self, backend_recovered_profile):
2112
backend = backend_recovered_profile("sender", user=user_1)

tests-functional/tests/test_init_status_app.py

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import logging
2+
import os
23

3-
from clients.status_backend import StatusBackend
44
import pytest
5-
from clients.signals import SignalType
6-
import os
5+
6+
from clients.status_backend import StatusBackend
77

88

99
@pytest.mark.create_account
@@ -18,14 +18,7 @@ def setup_cleanup(self, close_status_backend_containers):
1818
@pytest.mark.init
1919
def test_init_app(self):
2020

21-
await_signals = [
22-
SignalType.MEDIASERVER_STARTED.value,
23-
SignalType.NODE_STARTED.value,
24-
SignalType.NODE_READY.value,
25-
SignalType.NODE_LOGIN.value,
26-
]
27-
28-
backend_client = StatusBackend(await_signals)
21+
backend_client = StatusBackend()
2922
backend_client.init_status_backend()
3023
backend_client.restore_account_and_login()
3124

tests-functional/tests/test_local_backup.py

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,7 @@ class TestLocalBackup:
1515

1616
@pytest.mark.init
1717
def test_local_backup(self, tmp_path):
18-
await_signals = [
19-
"mediaserver.started",
20-
"node.started",
21-
"node.ready",
22-
"node.login",
23-
]
24-
25-
backend_client = StatusBackend(await_signals)
18+
backend_client = StatusBackend()
2619
assert backend_client is not None
2720

2821
# Init and login
@@ -211,7 +204,7 @@ def test_local_backup(self, tmp_path):
211204
assert backup_file is not None
212205

213206
# Create a new installation
214-
backend_client2 = StatusBackend(await_signals)
207+
backend_client2 = StatusBackend()
215208
assert backend_client2 is not None
216209

217210
# Init and login
@@ -294,13 +287,7 @@ def test_local_backup(self, tmp_path):
294287
assert one_on_one_chat_recovered, "One-to-one chat was not restored correctly"
295288

296289
def test_local_backup_backwards_compatibility(self, tmp_path):
297-
await_signals = [
298-
"mediaserver.started",
299-
"node.started",
300-
"node.ready",
301-
"node.login",
302-
]
303-
backend_client = StatusBackend(await_signals)
290+
backend_client = StatusBackend()
304291
assert backend_client is not None
305292
# Restore the account with a hardcoded mnemonic to get the same private key
306293
backend_client.init_status_backend()

tests-functional/tests/test_local_pairing.py

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
import re
2+
23
import pytest
4+
35
from clients.api import ApiResponseError
46
from clients.services.wakuext import ActivityCenterNotificationType, ContactRequestState
57
from clients.signals import SignalType, LocalPairingEventType, LocalPairingEventAction
68
from clients.status_backend import StatusBackend
79
from resources.constants import Account
8-
from steps.messenger import MessengerSteps
910
from resources.enums import MessageContentType
11+
from steps.messenger import MessengerSteps
1012

1113

1214
def check_server_sender_events(events):
@@ -153,21 +155,13 @@ def login_paired_device(backend: StatusBackend, key_uid, password):
153155
@pytest.mark.rpc
154156
class TestLocalPairing(MessengerSteps):
155157

156-
await_signals = [
157-
SignalType.MESSAGES_NEW.value,
158-
SignalType.MESSAGE_DELIVERED.value,
159-
SignalType.NODE_LOGIN.value,
160-
SignalType.NODE_STOPPED.value,
161-
SignalType.LOCAL_PAIRING.value,
162-
]
163-
164158
@pytest.fixture(autouse=True)
165159
def setup_cleanup(self, close_status_backend_containers):
166160
"""Automatically cleanup containers after each test"""
167161
yield
168162

169-
def initialize_backend(self, await_signals, privileged=True, **kwargs):
170-
backend = StatusBackend(await_signals, privileged=privileged)
163+
def initialize_backend(self, privileged=True, **kwargs):
164+
backend = StatusBackend(privileged=privileged)
171165
backend.init_status_backend()
172166
backend.create_account_and_login(**kwargs)
173167
backend.wait_for_login()
@@ -176,10 +170,10 @@ def initialize_backend(self, await_signals, privileged=True, **kwargs):
176170

177171
def test_pairing_server_as_sender(self):
178172
# Create users
179-
alice = self.initialize_backend(self.await_signals, False)
180-
bob = self.initialize_backend(self.await_signals, False)
173+
alice = self.initialize_backend(False)
174+
bob = self.initialize_backend(False)
181175

182-
bob_second_device = StatusBackend(self.await_signals)
176+
bob_second_device = StatusBackend()
183177
bob_second_device.init_status_backend()
184178

185179
# Make contacts before local pairing
@@ -257,9 +251,9 @@ def test_pairing_server_as_sender(self):
257251

258252
def test_pairing_server_as_receiver(self):
259253
# Create users
260-
alice = self.initialize_backend(self.await_signals, False)
261-
bob = self.initialize_backend(self.await_signals, False)
262-
bob_second_device = StatusBackend(self.await_signals)
254+
alice = self.initialize_backend(False)
255+
bob = self.initialize_backend(False)
256+
bob_second_device = StatusBackend()
263257
bob_second_device.init_status_backend()
264258

265259
# Make contacts before local pairing
@@ -301,14 +295,14 @@ def test_pairing_server_as_receiver(self):
301295

302296
def test_pairing_three_devices(self):
303297
# Create users
304-
bob1 = self.initialize_backend(self.await_signals, False)
305-
bob2 = StatusBackend(self.await_signals)
298+
bob1 = self.initialize_backend(False)
299+
bob2 = StatusBackend()
306300
bob2.init_status_backend()
307-
bob3 = StatusBackend(self.await_signals)
301+
bob3 = StatusBackend()
308302
bob3.init_status_backend()
309-
user_accepted = self.initialize_backend(self.await_signals, False)
310-
user_pending = self.initialize_backend(self.await_signals, False)
311-
user_declined = self.initialize_backend(self.await_signals, False)
303+
user_accepted = self.initialize_backend(False)
304+
user_pending = self.initialize_backend(False)
305+
user_declined = self.initialize_backend(False)
312306

313307
# Setup contacts before local pairing
314308
self.make_contacts(user_accepted, bob1)
@@ -356,8 +350,8 @@ def test_pairing_three_devices(self):
356350
assert user_declined_notification["dismissed"] is True
357351

358352
def test_pairing_receiver_must_be_logged_out(self):
359-
sender = self.initialize_backend(self.await_signals, False)
360-
receiver = self.initialize_backend(self.await_signals, False)
353+
sender = self.initialize_backend(False)
354+
receiver = self.initialize_backend(False)
361355

362356
# Client receiver must be logged out
363357
connection_string = sender.get_connection_string_for_bootstrapping_another_device()

0 commit comments

Comments
 (0)