Merge branch 'main' into LLT-5939_fix_windows_network_provisioning

NordSecurity · Jan 22, 2025 · 7ac3db2 · 7ac3db2
2 parents f5002c3 + 44f8084
commit 7ac3db2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.unreleased/natlab_fix b/.unreleased/natlab_fix
diff --git a/nat-lab/tests/test_wg_adapter.py b/nat-lab/tests/test_wg_adapter.py
@@ -2,6 +2,7 @@
 from contextlib import AsyncExitStack
 from datetime import datetime
 from helpers import SetupParameters, setup_environment
+from Pyro5.errors import CommunicationError  # type:ignore
 from utils.bindings import TelioAdapterType
 from utils.connection_util import ConnectionTag, new_connection_by_tag
 from utils.process import ProcessExecError
@@ -43,9 +44,7 @@ async def test_wg_adapter_cleanup(conn_tag: ConnectionTag):
             await conn.create_process(
                 ["taskkill", "/T", "/F", "/IM", "python.exe"]
             ).execute()
-    except ProcessExecError:
-        pass
-    except ConnectionRefusedError as e:
+    except (CommunicationError, ConnectionRefusedError, ProcessExecError) as e:
         print(datetime.now(), f"First libtelio failed with {e}")
 
     # Check if libtelio left hanging wintun adapter, might now always happen, so we just leave test