Merging upstream version 1:2.12.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 16 insertions, 5 deletions

diff --git a/test/t/unit/test_unit_expand.py b/test/t/unit/test_unit_expand.py
index d2a3ebc..0be6c52 100644
--- a/test/t/unit/test_unit_expand.py
+++ b/test/t/unit/test_unit_expand.py
@@ -1,31 +1,42 @@
 import pytest
 
-from conftest import assert_bash_exec
+from conftest import assert_bash_exec, bash_env_saved
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^[+-](cur|COMPREPLY)=")
 class TestUnitExpand:
     def test_1(self, bash):
-        assert_bash_exec(bash, "_expand >/dev/null")
+        assert_bash_exec(bash, "_comp_expand >/dev/null")
 
     def test_2(self, bash):
         """Test environment non-pollution, detected at teardown."""
-        assert_bash_exec(bash, "foo() { _expand; }; foo; unset foo")
+        assert_bash_exec(bash, "foo() { _comp_expand; }; foo; unset -f foo")
 
     def test_user_home_compreply(self, bash, user_home):
         user, home = user_home
         output = assert_bash_exec(
             bash,
-            r'cur="~%s"; _expand; printf "%%s\n" "$COMPREPLY"' % user,
+            r'cur="~%s"; _comp_expand; printf "%%s\n" "$COMPREPLY"' % user,
             want_output=True,
         )
         assert output.strip() == home
 
+    def test_user_home_compreply_failglob(self, bash, user_home):
+        user, home = user_home
+        with bash_env_saved(bash) as bash_env:
+            bash_env.shopt("failglob", True)
+            output = assert_bash_exec(
+                bash,
+                r'cur="~%s"; _comp_expand; printf "%%s\n" "$COMPREPLY"' % user,
+                want_output=True,
+            )
+        assert output.strip() == home
+
     def test_user_home_cur(self, bash, user_home):
         user, home = user_home
         output = assert_bash_exec(
             bash,
-            r'cur="~%s/a"; _expand; printf "%%s\n" "$cur"' % user,
+            r'cur="~%s/a"; _comp_expand; printf "%%s\n" "$cur"' % user,
             want_output=True,
         )
         assert output.strip() == "%s/a" % home