test(assert_complete): support systems with OLDPWD being unset

Author: akinomyoga

test/t/conftest.py

@@ -499,10 +499,12 @@ def assert_complete(
     if cwd:
         assert_bash_exec(
             bash,
-            "_bash_completion_test_OLDPWD=$OLDPWD;cd %s"
-            % shlex.quote(str(cwd)),
+            "if [[ ${OLDPWD+set} ]]; then _bash_completion_test_OLDPWD=$OLDPWD; else unset -v _bash_completion_test_OLDPWD; fi",
             want_output=None,
         )
+        assert_bash_exec(
+            bash, "builtin cd %s" % shlex.quote(str(cwd)), want_output=None
+        )
     env_prefix = "_BASHCOMP_TEST_"
     env = kwargs.get("env", {})
     if env:
@@ -567,7 +569,7 @@ def assert_complete(
         if cwd:
             assert_bash_exec(
                 bash,
-                "cd -;OLDPWD=$_bash_completion_test_OLDPWD",
+                "builtin cd -;if [[ ${_bash_completion_test_OLDPWD+set} ]]; then OLDPWD=$_bash_completion_test_OLDPWD; else unset -v OLDPWD; fi",
                 want_output=None,
             )
     return result

test/t/unit/test_unit_known_hosts_real.py

@@ -140,10 +140,13 @@ def test_included_configs(self, bash, hosts):
         assert sorted(set(output.strip().split())) == sorted(expected)
 
     def test_no_globbing(self, bash):
+        assert_bash_exec(
+            bash, 'OLDHOME="$HOME"; HOME="$PWD/_known_hosts_real"'
+        )
         assert_bash_exec(
             bash,
-            'OLDHOME="$HOME"; HOME="$PWD/_known_hosts_real";'
-            "_bash_completion_test_OLDPWD=$OLDPWD;cd _known_hosts_real",
+            "if [[ ${OLDPWD+set} ]]; then _bash_completion_test_OLDPWD=$OLDPWD; else unset -v _bash_completion_test_OLDPWD; fi; "
+            "builtin cd _known_hosts_real",
         )
         output = assert_bash_exec(
             bash,
@@ -154,9 +157,10 @@ def test_no_globbing(self, bash):
         )
         assert_bash_exec(
             bash,
-            "cd - >/dev/null;OLDPWD=$_bash_completion_test_OLDPWD;"
-            'HOME="$OLDHOME"',
+            "builtin cd - >/dev/null; "
+            "if [[ ${_bash_completion_test_OLDPWD+set} ]]; then OLDPWD=$_bash_completion_test_OLDPWD; else unset -v OLDPWD; fi",
         )
+        assert_bash_exec(bash, 'HOME="$OLDHOME"')
 
         completion = sorted(set(output.strip().split()))
         assert "gee" in completion