New upstream version 2.11upstream/2.11upstream

1 files changed, 11 insertions, 2 deletions

diff --git a/test/t/test_ant.py b/test/t/test_ant.py
index b14beb94..94acea11 100644
--- a/test/t/test_ant.py
+++ b/test/t/test_ant.py
@@ -1,5 +1,7 @@
 import pytest
 
+from conftest import assert_bash_exec
+
 
 @pytest.mark.bashcomp(ignore_env=r"^\+ANT_ARGS=")
 class TestAnt:
@@ -18,8 +20,15 @@ class TestAnt:
     @pytest.mark.complete(
         "ant ", cwd="ant", env=dict(ANT_ARGS="'-f named-build.xml'")
     )
-    def test_4(self, completion):
-        assert completion == "named-build"
+    def test_4(self, bash, completion):
+        output = assert_bash_exec(bash, "complete -p ant", want_output=True)
+        if "complete-ant-cmd.pl" in output:
+            # Some versions of complete-ant-cmd.pl don't treat ANT_ARGS right;
+            # in those cases we get the correct completion produced by _ant
+            # plus whatever complete-ant-cmd.pl was able to get from build.xml
+            assert "named-build" in completion
+        else:
+            assert completion == "named-build"
 
     @pytest.mark.complete("ant -l ")
     def test_5(self, completion):