test(diff_env): do not ignore changes of OLDPWD

Author: akinomyoga

test/t/conftest.py

@@ -408,7 +408,10 @@ def diff_env(before: List[str], after: List[str], ignore: str):
         # Remove unified diff markers:
         if not re.search(r"^(---|\+\+\+|@@ )", x)
         # Ignore variables expected to change:
-        and not re.search("^[-+](_|PPID|BASH_REMATCH|OLDPWD)=", x)
+        and not re.search(
+            "^[-+](_|PPID|BASH_REMATCH|_bash_completion_test_[a-zA-Z_0-9]*)=",
+            x,
+        )
         # Ignore likely completion functions added by us:
         and not re.search(r"^\+declare -f _.+", x)
         # ...and additional specified things:
@@ -494,7 +497,12 @@ def assert_complete(
             pytest.xfail(xfail)
     cwd = kwargs.get("cwd")
     if cwd:
-        assert_bash_exec(bash, "cd '%s'" % cwd)
+        assert_bash_exec(
+            bash,
+            "_bash_completion_test_OLDPWD=$OLDPWD;cd %s"
+            % shlex.quote(str(cwd)),
+            want_output=None,
+        )
     env_prefix = "_BASHCOMP_TEST_"
     env = kwargs.get("env", {})
     if env:
@@ -557,7 +565,11 @@ def assert_complete(
                 % " ".join("%s%s" % (env_prefix, k) for k in env.keys()),
             )
         if cwd:
-            assert_bash_exec(bash, "cd - >/dev/null")
+            assert_bash_exec(
+                bash,
+                "cd -;OLDPWD=$_bash_completion_test_OLDPWD",
+                want_output=None,
+            )
     return result
 
 

test/t/unit/test_unit_known_hosts_real.py

@@ -141,18 +141,23 @@ def test_included_configs(self, bash, hosts):
 
     def test_no_globbing(self, bash):
         assert_bash_exec(
-            bash, 'OLDHOME="$HOME"; HOME="%s/_known_hosts_real"' % bash.cwd
+            bash,
+            'OLDHOME="$HOME"; HOME="$PWD/_known_hosts_real";'
+            "_bash_completion_test_OLDPWD=$OLDPWD;cd _known_hosts_real",
         )
         output = assert_bash_exec(
             bash,
-            "cd _known_hosts_real; "
             "unset -v COMPREPLY COMP_KNOWN_HOSTS_WITH_HOSTFILE; "
             "_known_hosts_real -aF config ''; "
-            r'printf "%s\n" "${COMPREPLY[@]}"; '
-            "cd - &>/dev/null",
+            r'printf "%s\n" "${COMPREPLY[@]}"',
             want_output=True,
         )
-        assert_bash_exec(bash, 'HOME="$OLDHOME"')
+        assert_bash_exec(
+            bash,
+            "cd - >/dev/null;OLDPWD=$_bash_completion_test_OLDPWD;"
+            'HOME="$OLDHOME"',
+        )
+
         completion = sorted(set(output.strip().split()))
         assert "gee" in completion
         assert "gee-filename-canary" not in completion