Merging upstream version 1:2.12.0.

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

1 files changed, 10 insertions, 3 deletions

diff --git a/test/t/test_mutt.py b/test/t/test_mutt.py
index 0c4074f..e5b6387 100644
--- a/test/t/test_mutt.py
+++ b/test/t/test_mutt.py
@@ -5,6 +5,13 @@ from conftest import assert_bash_exec
 
 @pytest.mark.bashcomp(pre_cmds=("HOME=$PWD/mutt",))
 class TestMutt:
+    @pytest.fixture(scope="class")
+    def functions(self, bash):
+        assert_bash_exec(
+            bash,
+            '_comp_test__muttconffiles() { local REPLY; _comp_cmd_mutt__get_conffiles "$@" && printf "%s\\n" "${REPLY[@]}"; }',
+        )
+
     @pytest.mark.complete("mutt -")
     def test_1(self, completion):
         assert completion
@@ -17,17 +24,17 @@ class TestMutt:
     def test_3(self, completion):
         assert completion == "a1 a2".split()
 
-    def test_4(self, bash):
+    def test_4(self, bash, functions):
         got = (
             assert_bash_exec(
                 bash,
-                '_muttconffiles "$HOME/muttrc" "$HOME/muttrc"',
+                '_comp_test__muttconffiles "$HOME/muttrc" "$HOME/muttrc"',
                 want_output=True,
             )
             .strip()
             .split()
         )
         assert got == [
-            "%s/mutt/%s" % (bash.cwd, x)
+            f"{bash.cwd}/mutt/{x}"
             for x in ("muttrc", "bar/muttrc_b", "foo/muttrc_f")
         ]