From 00933b9382cb81397304dc778ae53b67b6096020 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 24 Jan 2025 16:49:04 +0100 Subject: [PATCH] NMTST_USE_VALGRIND=1 NM_TEST_CLIENT_CLOUD_SETUP_PATH=build/src/nm-cloud-setup/nm-cloud-setup python src/tests/client/test-client.py TestNmCloudSetup.test_oci_vlans x --- src/tests/client/test-client.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py index 149bfb0712..e54de3635e 100755 --- a/src/tests/client/test-client.py +++ b/src/tests/client/test-client.py @@ -713,7 +713,7 @@ class Configuration: ) if not os.path.isdir(v): raise Exception("Missing builddir. Set NM_TEST_CLIENT_BUILDDIR?") - elif name == ENV_NM_TEST_CLIENT_NMCLI_PATH: + elif name == "ENV_NM_TEST_CLIENT_NMCLI_UNCHECKED_PATH": v = os.environ.get(ENV_NM_TEST_CLIENT_NMCLI_PATH, None) if v is None: try: @@ -722,6 +722,8 @@ class Configuration: ) except: pass + elif name == ENV_NM_TEST_CLIENT_NMCLI_PATH: + v = self.get("ENV_NM_TEST_CLIENT_NMCLI_UNCHECKED_PATH") if not os.path.exists(v): raise Exception("Missing nmcli binary. Set NM_TEST_CLIENT_NMCLI_PATH?") elif name == ENV_NM_TEST_CLIENT_CLOUD_SETUP_PATH: @@ -786,7 +788,7 @@ class Configuration: v = os.environ.get(name, None) if v is None: v = os.path.abspath( - os.path.dirname(self.get(ENV_NM_TEST_CLIENT_NMCLI_PATH)) + os.path.dirname(self.get("ENV_NM_TEST_CLIENT_NMCLI_UNCHECKED_PATH")) + "/../../libtool" ) if not os.path.isfile(v):