From b387118e7aa7377ef64e96a030ad77b2bba28a68 Mon Sep 17 00:00:00 2001
From: Alexander Bushnev <Alexander@Bushnev.pro>
Date: Fri, 13 Dec 2024 18:07:34 +0100
Subject: [PATCH] Add router error check to test

---
 src/transport/unicast/lease.c     |  1 +
 src/transport/unicast/transport.c |  1 +
 tests/connection_restore.py       | 27 ++++++++++++++++++++++-----
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/transport/unicast/lease.c b/src/transport/unicast/lease.c
index 84019e474..0f461979c 100644
--- a/src/transport/unicast/lease.c
+++ b/src/transport/unicast/lease.c
@@ -64,6 +64,7 @@ void *_zp_unicast_lease_task(void *ztu_arg) {
                 // Reset the lease parameters
                 ztu->_received = false;
             } else {
+                // THIS LOG STRING USED IN TEST, change with caution
                 _Z_INFO("Closing session because it has expired after %zums", ztu->_common._lease);
                 _zp_unicast_failed(ztu);
                 return 0;
diff --git a/src/transport/unicast/transport.c b/src/transport/unicast/transport.c
index 54d08a1fe..53e316df9 100644
--- a/src/transport/unicast/transport.c
+++ b/src/transport/unicast/transport.c
@@ -219,6 +219,7 @@ static z_result_t _z_unicast_handshake_client(_z_transport_unicast_establish_par
         _z_t_msg_clear(&oam);
         ret = _Z_ERR_MESSAGE_UNEXPECTED;
     }
+    // THIS LOG STRING USED IN TEST, change with caution
     _Z_DEBUG("Received Z_OPEN(Ack)");
     param->_lease = oam._body._open._lease;  // The session lease
     // The initial SN at RX side. Initialize the session as we had already received
diff --git a/tests/connection_restore.py b/tests/connection_restore.py
index 239c46205..f5b25f498 100644
--- a/tests/connection_restore.py
+++ b/tests/connection_restore.py
@@ -7,6 +7,7 @@
 WAIT_MESSAGE_TIMEOUT_S = 15
 DISCONNECT_MESSAGE = "Closing session because it has expired"
 CONNECT_MESSAGE = "Z_OPEN(Ack)"
+ROUTER_ERROR_MESSAGE = "ERROR"
 ZENOH_PORT = "7447"
 
 ROUTER_ARGS = ['-l', f'tcp/0.0.0.0:{ZENOH_PORT}', '--no-multicast-scouting']
@@ -22,8 +23,7 @@ def run_process(command, output_collector, process_list):
     process_list.append(process)
     for line in iter(process.stdout.readline, ''):
         print("--", line.strip())
-        if output_collector is not None:
-            output_collector.append(line.strip())
+        output_collector.append(line.strip())
     process.stdout.close()
     process.wait()
 
@@ -62,13 +62,22 @@ def wait_message(client_output, message):
     return False
 
 
+def check_router_errors(router_output):
+    for line in router_output:
+        if ROUTER_ERROR_MESSAGE in line:
+            print("Router have an error: ", line)
+            return False
+    return True
+
+
 def test_connection(router_command, client_command, timeout, wait_disconnect):
     print(f"Drop test {client_command} for timeout {timeout}")
+    router_output = []
     client_output = []
     process_list = []
     blocked = False
     try:
-        run_background(router_command, None, process_list)
+        run_background(router_command, router_output, process_list)
         time.sleep(ROUTER_INIT_TIMEOUT_S)
 
         run_background(client_command, client_output, process_list)
@@ -105,6 +114,9 @@ def test_connection(router_command, client_command, timeout, wait_disconnect):
                 print("Failed to restore connection.")
                 return False
 
+        if not check_router_errors(router_output):
+            return False
+
         print(f"Drop test {client_command} for timeout {timeout} passed")
         return True
     finally:
@@ -115,11 +127,12 @@ def test_connection(router_command, client_command, timeout, wait_disconnect):
 
 def test_restart(router_command, client_command, timeout):
     print(f"Restart test {client_command} for timeout {timeout}")
+    router_output = []
     client_output = []
     router_process_list = []
     client_process_list = []
     try:
-        run_background(router_command, None, router_process_list)
+        run_background(router_command, router_output, router_process_list)
         time.sleep(ROUTER_INIT_TIMEOUT_S)
 
         run_background(client_command, client_output, client_process_list)
@@ -136,7 +149,8 @@ def test_restart(router_command, client_command, timeout):
         time.sleep(timeout)
 
         print("Start router...")
-        run_background(router_command, None, router_process_list)
+        run_background(router_command, router_output, router_process_list)
+        time.sleep(ROUTER_INIT_TIMEOUT_S)
 
         if wait_message(client_output, CONNECT_MESSAGE):
             print("Connection restored successfully.")
@@ -144,6 +158,9 @@ def test_restart(router_command, client_command, timeout):
             print("Failed to restore connection.")
             return False
 
+        if not check_router_errors(router_output):
+            return False
+
         print(f"Restart test {client_command} for timeout {timeout} passed")
         return True
     finally: