rework existing tests to use new update_env() method

Author: thorsten-klein

tests/test_config.py

@@ -9,7 +9,7 @@
 from typing import Any
 
 import pytest
-from conftest import cmd, cmd_raises
+from conftest import cmd, cmd_raises, update_env
 
 from west import configuration as config
 from west.util import PathType
@@ -213,19 +213,18 @@ def test_local_creation_with_topdir():
     # The autouse fixture at the top of this file has set up an
     # environment variable for our local config file. Disable it
     # to make sure the API works with a 'real' topdir.
-    del os.environ['WEST_CONFIG_LOCAL']
-
-    # We should be able to write into our topdir's config file now.
-    update_testcfg('pytest', 'key', 'val', configfile=LOCAL, topdir=str(topdir))
-    assert not system.exists()
-    assert not glbl.exists()
-    assert not local.exists()
-    assert topdir_config.exists()
-
-    assert cfg(f=ALL, topdir=str(topdir))['pytest']['key'] == 'val'
-    assert 'pytest' not in cfg(f=SYSTEM)
-    assert 'pytest' not in cfg(f=GLOBAL)
-    assert cfg(f=LOCAL, topdir=str(topdir))['pytest']['key'] == 'val'
+    with update_env({'WEST_CONFIG_LOCAL': None}):
+        # We should be able to write into our topdir's config file now.
+        update_testcfg('pytest', 'key', 'val', configfile=LOCAL, topdir=str(topdir))
+        assert not system.exists()
+        assert not glbl.exists()
+        assert not local.exists()
+        assert topdir_config.exists()
+
+        assert cfg(f=ALL, topdir=str(topdir))['pytest']['key'] == 'val'
+        assert 'pytest' not in cfg(f=SYSTEM)
+        assert 'pytest' not in cfg(f=GLOBAL)
+        assert cfg(f=LOCAL, topdir=str(topdir))['pytest']['key'] == 'val'
 
 def test_append():
     update_testcfg('pytest', 'key', 'system', configfile=SYSTEM)

tests/test_manifest.py

@@ -31,6 +31,7 @@
     create_repo,
     create_workspace,
     rev_parse,
+    update_env,
 )
 
 from west.configuration import ConfigFile, Configuration, MalformedConfig
@@ -164,12 +165,9 @@ def test_manifest_from_file_with_fall_back(manifest_repo):
         ''')
     repo_abspath = Path(str(manifest_repo))
     os.chdir(repo_abspath.parent.parent)  # this is the tmp_workspace dir
-    try:
-        os.environ['ZEPHYR_BASE'] = os.fspath(manifest_repo)
+    with update_env({'ZEPHYR_BASE': os.fspath(manifest_repo)}):
         manifest = MF()
-        assert Path(manifest.repo_abspath) == repo_abspath
-    finally:
-        del os.environ['ZEPHYR_BASE']
+    assert Path(manifest.repo_abspath) == repo_abspath
 
 def test_validate():
     # Get some coverage for west.manifest.validate.