test(assert_complete): support "shopt" arg

Author: akinomyoga

test/t/conftest.py

@@ -9,7 +9,16 @@
 import time
 from pathlib import Path
 from types import TracebackType
-from typing import Callable, Iterable, Iterator, List, Optional, Tuple, Type
+from typing import (
+    Callable,
+    Dict,
+    Iterable,
+    Iterator,
+    List,
+    Optional,
+    Tuple,
+    Type,
+)
 
 import pexpect  # type: ignore[import]
 import pytest
@@ -389,7 +398,6 @@ def assert_bash_exec(
 
 
 class bash_env_saved:
-
     def __init__(self, bash: pexpect.spawn, sendintr: bool = False):
         self.bash = bash
         self.cwd: Optional[str] = None
@@ -609,6 +617,9 @@ def assert_complete(
         for k, v in kwargs.get("env", {}).items():
             bash_env.write_env(k, v)
 
+        for k, v in kwargs.get("shopt", {}).items():
+            bash_env.shopt(k, v)
+
         bash.send(cmd + "\t")
         # Sleep a bit if requested, to avoid `.*` matching too early
         time.sleep(kwargs.get("sleep_after_tab", 0))

test/t/test_man.py

@@ -100,11 +100,10 @@ def test_8(self, completion):
         "man %s" % assumed_present,
         require_cmd=True,
         cwd="shared/empty_dir",
-        pre_cmds=("shopt -s failglob",),
+        shopt=dict(failglob=True),
     )
     def test_9(self, bash, completion):
         assert self.assumed_present in completion
-        assert_bash_exec(bash, "shopt -u failglob")
 
     @pytest.mark.complete(require_cmd=True)
     def test_10(self, request, bash, colonpath):

test/t/test_tar.py

@@ -13,10 +13,9 @@ def gnu_tar(self, bash):
         if not re.search(r"\bGNU ", got):
             pytest.skip("Not GNU tar")
 
-    @pytest.mark.complete("tar ", pre_cmds=("shopt -s failglob",))
+    @pytest.mark.complete("tar ", shopt=dict(failglob=True))
     def test_1(self, bash, completion):
         assert completion
-        assert_bash_exec(bash, "shopt -u failglob")
 
     # Test "f" when mode is not as first option
     @pytest.mark.complete("tar zfc ", cwd="tar")