fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-06 06:48:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

test-client: fix TestNmCloudSetup valgrind run

Browse source 
Allow running the following locally (for quick loval nm-c-s valgrind check),
without requiring $NM_TEST_CLIENT_NMCLI_PATH to be set.

  $ NM_TEST_CLIENT_CLOUD_SETUP_PATH=build/src/nm-cloud-setup/nm-cloud-setup \
      NMTST_USE_VALGRIND=1 python src/tests/client/test-client.py TestNmCloudSetup
This commit is contained in:
Lubomir Rintel 2025-01-24 16:49:04 +01:00
parent 610e0cb8cd
commit a6402fed71
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/tests/client/test-client.py
View file

@ -738,7 +738,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:
@ -747,6 +747,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:
@ -811,7 +813,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):