Skip to content

integration, perf: websocket timeout + fix error handling #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 6, 2025
Merged

integration, perf: websocket timeout + fix error handling #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d090a76
set ws timeout and add try/catch
lupin012 Mar 5, 2025
99edeec
correct error msg
lupin012 Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions integration/run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@

"mainnet/trace_replayBlockTransactions/test_29", # diff on stack info

"mainnet/trace_transaction/test_44", # diff on error message
"mainnet/trace_transaction/test_47", # diff on error message

"mainnet/engine_"
]

Expand Down Expand Up @@ -530,7 +527,7 @@ def execute_request(transport_type: str, jwt_auth, encoded, request_dumps, targe
if jwt_auth:
http_headers['Authorization' ] = jwt_auth
with connect(ws_target, max_size=1000048576, compression=selected_compression,
extensions=curr_extensions) as websocket:
extensions=curr_extensions, open_timeout=None) as websocket:
websocket.send(request_dumps)
rsp = websocket.recv(None)
result = json.loads(rsp)
Expand Down Expand Up @@ -846,11 +843,15 @@ def main(argv) -> int:
(config.start_test != "" and test_number_in_any_loop >= int(
config.start_test))):
# create process pool
future = exe.submit(run_test, json_test_full_name, test_number_in_any_loop, transport_type, config)
tests_descr_list.append({'name': json_test_full_name, 'number': test_number_in_any_loop, 'transport-type': transport_type, 'future': future})
if config.waiting_time:
time.sleep(config.waiting_time/1000)
executed_tests = executed_tests + 1
try:
future = exe.submit(run_test, json_test_full_name, test_number_in_any_loop, transport_type, config)
tests_descr_list.append({'name': json_test_full_name, 'number': test_number_in_any_loop, 'transport-type': transport_type, 'future': future})
if config.waiting_time:
time.sleep(config.waiting_time/1000)
executed_tests = executed_tests + 1
except Exception as e:
print(f"An error occurred: {e}")
return 100

global_test_number = global_test_number + 1
test_number_in_any_loop = test_number_in_any_loop + 1
Expand Down
6 changes: 5 additions & 1 deletion perf/run_perf_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,8 +390,12 @@ def get_result(self, test_number, repetition, daemon_name, qps_value, duration):
print(" [ Ratio="+ratio+", MaxLatency="+max_latency+"]")
finally:
file.close()

if error != "":
print ("test failed: " + error)
return 1

if error != "" or ratio != "100.00%":
if ratio != "100.00%":
print ("test failed: ratio is not 100.00%")
return 1

Expand Down