_xinetd_services: look up from $BASHCOMP_XINETDDIR, add some unit tests

Author: scop

bash_completion

@@ -1166,7 +1166,7 @@ _backup_glob='@(#*#|*@(~|.@(bak|orig|rej|swp|dpkg*|rpm@(orig|new|save))))'
 #
 _xinetd_services()
 {
-    local xinetddir=/etc/xinetd.d
+    local xinetddir=${BASHCOMP_XINETDDIR:-/etc/xinetd.d}
     if [[ -d $xinetddir ]]; then
         local IFS=$' \t\n' reset=$(shopt -p nullglob); shopt -s nullglob
         local -a svcs=( $(printf '%s\n' $xinetddir/!($_backup_glob)) )

test/t/unit/Makefile.am

@@ -13,7 +13,8 @@ EXTRA_DIST = \
 	test_unit_parse_usage.py \
 	test_unit_quote.py \
 	test_unit_tilde.py \
-	test_unit_variables.py
+	test_unit_variables.py \
+	test_unit_xinetd_services.py
 
 all:
 

test/t/unit/test_unit_xinetd_services.py

@@ -0,0 +1,22 @@
+import pytest
+
+from conftest import assert_bash_exec
+
+
+@pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
+class TestUnitXinetdServices:
+    def test_direct(self, bash):
+        assert_bash_exec(bash, "_xinetd_services >/dev/null")
+
+    def test_env_non_pollution(self, bash):
+        """Test environment non-pollution, detected at teardown."""
+        assert_bash_exec(bash, "foo() { _xinetd_services; }; foo; unset foo")
+
+    def test_basic(self, bash):
+        output = assert_bash_exec(
+            bash,
+            "foo() { local BASHCOMP_XINETDDIR=$PWD/shared/bin;unset COMPREPLY; "
+            '_xinetd_services; printf "%s\\n" "${COMPREPLY[@]}"; }; foo; unset foo',
+            want_output=True,
+        )
+        assert sorted(output.split()) == ["arp", "ifconfig"]