Merge pull request scop#1213 from akinomyoga/failglob-test

scop · web-flow · commit 165bd3230675 · 2024-06-17T08:08:04.000+03:00
test: fix tests for failglob
diff --git a/test/t/conftest.py b/test/t/conftest.py
@@ -665,7 +665,7 @@ def chdir(self, path: str):
     def set(self, name: str, value: bool):
         self._unprotect_set(name)
         if value:
-            self._safe_exec("set -u %s" % name)
+            self._safe_exec("set -o %s" % name)
         else:
             self._safe_exec("set +o %s" % name)
         self._protect_set(name)
diff --git a/test/t/unit/Makefile.am b/test/t/unit/Makefile.am
@@ -4,39 +4,39 @@ EXTRA_DIST = \
 	test_unit_compgen.py \
 	test_unit_compgen_available_interfaces.py \
 	test_unit_compgen_commands.py \
+	test_unit_compgen_filedir.py \
+	test_unit_compgen_ip_addresses.py \
+	test_unit_compgen_known_hosts.py \
+	test_unit_compgen_pgids.py \
+	test_unit_compgen_pids.py \
+	test_unit_compgen_pnames.py \
 	test_unit_compgen_split.py \
+	test_unit_compgen_tilde.py \
+	test_unit_compgen_variables.py \
+	test_unit_compgen_xinetd_services.py \
+	test_unit_complete_longopt.py \
 	test_unit_count_args.py \
 	test_unit_delimited.py \
 	test_unit_deprecate_func.py \
 	test_unit_dequote.py \
 	test_unit_expand.py \
 	test_unit_expand_glob.py \
 	test_unit_expand_tilde.py \
-	test_unit_filedir.py \
 	test_unit_find_unique_completion_pair.py \
-	test_unit_get_first_arg.py \
 	test_unit_get_cword.py \
+	test_unit_get_first_arg.py \
 	test_unit_get_words.py \
 	test_unit_initialize.py \
-	test_unit_ip_addresses.py \
-	test_unit_known_hosts.py \
 	test_unit_load.py \
-	test_unit_longopt.py \
 	test_unit_looks_like_path.py \
 	test_unit_parse_help.py \
 	test_unit_parse_usage.py \
-	test_unit_pgids.py \
-	test_unit_pids.py \
-	test_unit_pnames.py \
 	test_unit_quote.py \
 	test_unit_quote_compgen.py \
 	test_unit_realcommand.py \
 	test_unit_split.py \
-	test_unit_tilde.py \
 	test_unit_unlocal.py \
-	test_unit_variables.py \
-	test_unit_xfunc.py \
-	test_unit_xinetd_services.py
+	test_unit_xfunc.py
 
 all:
 
diff --git a/test/t/unit/test_unit_compgen_filedir.py b/test/t/unit/test_unit_compgen_filedir.py
@@ -10,7 +10,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
-class TestUnitFiledir:
+class TestUnitCompgenFiledir:
     @pytest.fixture(scope="class")
     def functions(self, request, bash):
         assert_bash_exec(
diff --git a/test/t/unit/test_unit_compgen_ip_addresses.py b/test/t/unit/test_unit_compgen_ip_addresses.py
@@ -4,7 +4,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
-class TestUnitIpAddresses:
+class TestUnitCompgenIpAddresses:
     @pytest.fixture(scope="class")
     def functions(self, request, bash):
         assert_bash_exec(
diff --git a/test/t/unit/test_unit_compgen_known_hosts.py b/test/t/unit/test_unit_compgen_known_hosts.py
diff --git a/test/t/unit/test_unit_compgen_pgids.py b/test/t/unit/test_unit_compgen_pgids.py
@@ -6,7 +6,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+(COMPREPLY|cur)=")
-class TestUnitPgids:
+class TestUnitCompgenPgids:
     def test_smoke(self, bash):
         with bash_env_saved(bash) as bash_env:
             bash_env.write_variable("cur", "")
diff --git a/test/t/unit/test_unit_compgen_pids.py b/test/t/unit/test_unit_compgen_pids.py
@@ -6,7 +6,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
-class TestUnitPids:
+class TestUnitCompgenPids:
     def test_smoke(self, bash):
         with bash_env_saved(bash) as bash_env:
             bash_env.write_variable("cur", "")
diff --git a/test/t/unit/test_unit_compgen_pnames.py b/test/t/unit/test_unit_compgen_pnames.py
@@ -4,7 +4,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
-class TestUnitPnames:
+class TestUnitCompgenPnames:
     def test_smoke(self, bash):
         with bash_env_saved(bash) as bash_env:
             bash_env.write_variable("cur", "")
diff --git a/test/t/unit/test_unit_compgen_tilde.py b/test/t/unit/test_unit_compgen_tilde.py
@@ -4,7 +4,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
-class TestUnitTilde:
+class TestUnitCompgenTilde:
     def test_1(self, bash):
         assert_bash_exec(bash, "! _comp_compgen_tilde >/dev/null")
 
diff --git a/test/t/unit/test_unit_compgen_variables.py b/test/t/unit/test_unit_compgen_variables.py
@@ -4,7 +4,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^[+-](___var|assoc[12])=")
-class TestUnitVariables:
+class TestUnitCompgenVariables:
     @pytest.fixture(scope="class")
     def functions(self, request, bash):
         assert_bash_exec(bash, "unset assoc1 && declare -A assoc1=([idx]=1)")
diff --git a/test/t/unit/test_unit_compgen_xinetd_services.py b/test/t/unit/test_unit_compgen_xinetd_services.py
@@ -4,7 +4,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
-class TestUnitXinetdServices:
+class TestUnitCompgenXinetdServices:
     def test_direct(self, bash):
         assert_bash_exec(bash, "_comp_compgen_xinetd_services >/dev/null")
 
diff --git a/test/t/unit/test_unit_complete_longopt.py b/test/t/unit/test_unit_complete_longopt.py
@@ -6,7 +6,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None, ignore_env=r"^\+COMPREPLY=")
-class TestUnitLongopt:
+class TestUnitCompleteLongopt:
     @pytest.fixture(scope="class")
     def functions(self, request, bash):
         assert_bash_exec(bash, "_grephelp() { cat _longopt/grep--help.txt; }")
diff --git a/test/t/unit/test_unit_dequote.py b/test/t/unit/test_unit_dequote.py
@@ -154,6 +154,7 @@ def test_glob_failglob(self, bash):
 
     def test_glob_nullglob(self, bash):
         with bash_env_saved(bash) as bash_env:
+            bash_env.shopt("failglob", False)
             bash_env.shopt("nullglob", True)
             output = assert_bash_exec(
                 bash, "__tester 'non-existent-*.txt'", want_output=True
diff --git a/test/t/unit/test_unit_get_words.py b/test/t/unit/test_unit_get_words.py
@@ -7,11 +7,11 @@
     cmd=None,
     ignore_env=r"^(\+(words|cword|cur|prev)|[+-]COMP_(WORDS|CWORD|LINE|POINT))=",
 )
-class TestUnitGetCompWordsByRef(TestUnitBase):
+class TestUnitGetCompWords(TestUnitBase):
     def _test(self, bash, *args, **kwargs):
         assert_bash_exec(bash, "unset cur prev")
         output = self._test_unit(
-            "_comp_get_words %s cur prev; echo $cur,${prev-}",
+            '_comp_get_words %s cur prev; echo "$cur,${prev-}"',
             bash,
             *args,
             **kwargs,
diff --git a/test/t/unit/test_unit_initialize.py b/test/t/unit/test_unit_initialize.py
@@ -8,7 +8,7 @@
     ignore_env=r"^[+-](COMP(_(WORDS|CWORD|LINE|POINT)|REPLY)|"
     r"cur|prev|cword|words)=|^\+declare -f _cmd1$",
 )
-class TestUnitInitCompletion(TestUnitBase):
+class TestUnitInitialize(TestUnitBase):
     def test_1(self, bash):
         """Test environment non-pollution, detected at teardown."""
         assert_bash_exec(
diff --git a/test/t/unit/test_unit_looks_like_path.py b/test/t/unit/test_unit_looks_like_path.py
@@ -6,7 +6,7 @@
 
 
 @pytest.mark.bashcomp(cmd=None)
-class TestUnitQuote(TestUnitBase):
+class TestUnitLooksLikePath(TestUnitBase):
     @pytest.mark.parametrize(
         "thing_looks_like",
         (
