mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-03-06 22:10:33 +01:00
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
This commit is contained in:
parent
b05f5c42da
commit
00933b9382
1 changed files with 4 additions and 2 deletions
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue