test(kdvi,kpdf,evince): use @pytest.mark.bashcomp(temp_cwd=True)

Author: akinomyoga

test/t/conftest.py

@@ -674,21 +674,41 @@ def prepare_fixture_dir(
     tempdir = Path(tempfile.mkdtemp(prefix="bash-completion-fixture-dir"))
     request.addfinalizer(lambda: shutil.rmtree(str(tempdir)))
 
+    old_cwd = os.getcwd()
+    try:
+        os.chdir(tempdir)
+        new_files, new_dirs = create_dummy_filedirs(files, dirs)
+    finally:
+        os.chdir(old_cwd)
+
+    return tempdir, new_files, new_dirs
+
+
+def create_dummy_filedirs(
+    files: Iterable[str], dirs: Iterable[str]
+) -> Tuple[List[str], List[str]]:
+    """
+    Create dummy files and directories on the fly in the current directory.
+
+    Tests that contain filenames differing only by case should use this to
+    prepare a dir on the fly rather than including their fixtures in git and
+    the tarball. This is to work better with case insensitive file systems.
+    """
     new_files = []
     new_dirs = []
 
-    for file_ in files:
-        path = tempdir / file_
-        if not path.exists():
-            path.touch()
-            new_files.append(file_)
     for dir_ in dirs:
-        path = tempdir / dir_
+        path = Path(dir_)
         if not path.exists():
             path.mkdir()
             new_dirs.append(dir_)
+    for file_ in files:
+        path = Path(file_)
+        if not path.exists():
+            path.touch()
+            new_files.append(file_)
 
-    return tempdir, sorted(new_files), sorted(new_dirs)
+    return sorted(new_files), sorted(new_dirs)
 
 
 class TestUnitBase:

test/t/test_evince.py

@@ -1,17 +1,12 @@
-import shlex
-from pathlib import Path
-from typing import List, Tuple
-
 import pytest
 
-from conftest import assert_bash_exec, assert_complete, prepare_fixture_dir
+from conftest import assert_complete, create_dummy_filedirs
 
 
+@pytest.mark.bashcomp(temp_cwd=True)
 class TestEvince:
-    @pytest.fixture(scope="class")
-    def setup_fixture(self, request) -> Tuple[Path, List[str], List[str]]:
-        return prepare_fixture_dir(
-            request,
+    def test_1(self, bash):
+        files, dirs = create_dummy_filedirs(
             (
                 ".bmp .BMP .cbr .CBR .cbz .CBZ .djv .DJV .djvu .DJVU .dvi "
                 ".DVI .dvi.bz2 .dvi.BZ2 .DVI.bz2 .DVI.BZ2 .dvi.gz .dvi.GZ "
@@ -27,15 +22,7 @@ def setup_fixture(self, request) -> Tuple[Path, List[str], List[str]]:
             "foo".split(),
         )
 
-    def test_1(self, bash, setup_fixture):
-        fixture_dir, files, dirs = setup_fixture
-
-        assert_bash_exec(bash, "cd %s" % shlex.quote(str(fixture_dir)))
-        try:
-            completion = assert_complete(bash, "evince ")
-        finally:
-            assert_bash_exec(bash, "cd -", want_output=None)
-
+        completion = assert_complete(bash, "evince ")
         assert completion == [
             x
             for x in sorted(files + ["%s/" % d for d in dirs])

test/t/test_kdvi.py

@@ -1,33 +1,20 @@
-import shlex
-from pathlib import Path
-from typing import List, Tuple
-
 import pytest
 
-from conftest import assert_bash_exec, assert_complete, prepare_fixture_dir
+from conftest import assert_complete, create_dummy_filedirs
 
 
+@pytest.mark.bashcomp(temp_cwd=True)
 class TestKdvi:
-    @pytest.fixture(scope="class")
-    def setup_fixture(self, request) -> Tuple[Path, List[str], List[str]]:
-        return prepare_fixture_dir(
-            request,
+    def test_1(self, bash):
+        files, dirs = create_dummy_filedirs(
             (
                 ".dvi .DVI .dvi.bz2 .DVI.bz2 .dvi.gz .DVI.gz .dvi.Z .DVI.Z "
                 ".txt"
             ).split(),
             "foo".split(),
         )
 
-    def test_1(self, bash, setup_fixture):
-        fixture_dir, files, dirs = setup_fixture
-
-        assert_bash_exec(bash, "cd %s" % shlex.quote(str(fixture_dir)))
-        try:
-            completion = assert_complete(bash, "kdvi ")
-        finally:
-            assert_bash_exec(bash, "cd -", want_output=None)
-
+        completion = assert_complete(bash, "kdvi ")
         assert completion == [
             x
             for x in sorted(files + ["%s/" % d for d in dirs])

test/t/test_kpdf.py

@@ -1,30 +1,17 @@
-import shlex
-from pathlib import Path
-from typing import List, Tuple
-
 import pytest
 
-from conftest import assert_bash_exec, assert_complete, prepare_fixture_dir
+from conftest import assert_complete, create_dummy_filedirs
 
 
+@pytest.mark.bashcomp(temp_cwd=True)
 class TestKpdf:
-    @pytest.fixture(scope="class")
-    def setup_fixture(self, request) -> Tuple[Path, List[str], List[str]]:
-        return prepare_fixture_dir(
-            request,
+    def test_1(self, bash):
+        files, dirs = create_dummy_filedirs(
             ".eps .EPS .pdf .PDF .ps .PS .txt".split(),
             "foo".split(),
         )
 
-    def test_1(self, bash, setup_fixture):
-        fixture_dir, files, dirs = setup_fixture
-
-        assert_bash_exec(bash, "cd %s" % shlex.quote(str(fixture_dir)))
-        try:
-            completion = assert_complete(bash, "kpdf ")
-        finally:
-            assert_bash_exec(bash, "cd -", want_output=None)
-
+        completion = assert_complete(bash, "kpdf ")
         assert completion == [
             x
             for x in sorted(files + ["%s/" % d for d in dirs])