From 9108f8ecfcaa9741ab3adff0ac829c9540da7bbb Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 6 Apr 2022 11:59:43 +0200 Subject: [PATCH] client/test: allow overriding all environment variables Set extra variables after the pre-defined ones have been set. This allows overriding then. In particular, this allows overriding DBUS_SESSION_BUS_ADDRESS so that the test can check the behavior of the client is correct when it's set to some garbage. --- src/tests/client/test-client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/client/test-client.py b/src/tests/client/test-client.py index bb99b8cd30..fef8141587 100755 --- a/src/tests/client/test-client.py +++ b/src/tests/client/test-client.py @@ -854,9 +854,6 @@ class TestNmcli(NmTestBase): self.fail("invalid language %s" % (lang)) env = {} - if extra_env is not None: - for k, v in extra_env.items(): - env[k] = v for k in ["LD_LIBRARY_PATH", "DBUS_SESSION_BUS_ADDRESS"]: val = os.environ.get(k, None) if val is not None: @@ -873,6 +870,9 @@ class TestNmcli(NmTestBase): env["NM_TEST_CALLING_NUM"] = str(calling_num) if fatal_warnings is _DEFAULT_ARG or fatal_warnings: env["G_DEBUG"] = "fatal-warnings" + if extra_env is not None: + for k, v in extra_env.items(): + env[k] = v args = [conf.get(ENV_NM_TEST_CLIENT_NMCLI_PATH)] + list(args)