implement fallback list_relevant_files in terms of search_files

Author: Swatinem

codecov_cli/helpers/versioning_systems.py

@@ -1,11 +1,13 @@
 from itertools import chain
 import logging
+import re
 import subprocess
 import typing as t
 from pathlib import Path
 from shutil import which
 
 from codecov_cli.fallbacks import FallbackFieldEnum
+from codecov_cli.helpers.folder_searcher import search_files
 from codecov_cli.helpers.git import parse_git_service, parse_slug
 from abc import ABC, abstractmethod
 
@@ -193,22 +195,7 @@ def list_relevant_files(
         if dir_to_use is None:
             raise ValueError("Can't determine root folder")
 
-        cmd = [
-            "find",
-            str(dir_to_use),
-            *chain.from_iterable(
-                ["-name", block, "-prune", "-o"] for block in IGNORE_DIRS
-            ),
-            *chain.from_iterable(
-                ["-path", block, "-prune", "-o"] for block in IGNORE_PATHS
-            ),
-            "-type",
-            "f",
-            "-print",
-        ]
-        res = subprocess.run(cmd, capture_output=True)
-        return [
-            filename
-            for filename in res.stdout.decode("unicode_escape").strip().split("\n")
-            if filename
-        ]
+        files = search_files(
+            dir_to_use, folders_to_ignore=[], filename_include_regex=re.compile("")
+        )
+        return [f.relative_to(dir_to_use).as_posix() for f in files]

tests/helpers/test_versioning_systems.py

@@ -3,7 +3,10 @@
 import pytest
 
 from codecov_cli.fallbacks import FallbackFieldEnum
-from codecov_cli.helpers.versioning_systems import GitVersioningSystem
+from codecov_cli.helpers.versioning_systems import (
+    GitVersioningSystem,
+    NoVersioningSystem,
+)
 
 
 class TestGitVersioningSystem(object):
@@ -150,3 +153,12 @@ def test_exotic_git_filenames():
     assert (
         "tests/data/Контроллеры/Пользователь/ГлавныйКонтроллер.php" in found_repo_files
     )
+
+
+def test_exotic_fallback_filenames():
+    vs = NoVersioningSystem()
+    found_repo_files = vs.list_relevant_files()
+
+    assert (
+        "tests/data/Контроллеры/Пользователь/ГлавныйКонтроллер.php" in found_repo_files
+    )

tests/services/upload/test_upload_collector.py

@@ -1,7 +1,5 @@
 from pathlib import Path
 from unittest.mock import patch
-import pytest
-import sys
 
 from codecov_cli.helpers.versioning_systems import (
     GitVersioningSystem,
@@ -191,10 +189,6 @@ def test_generate_upload_data(tmp_path):
 
 
 @patch("codecov_cli.services.upload.upload_collector.logger")
-@pytest.mark.skipif(
-    sys.platform == "win32",
-    reason="the fallback `list_relevant_files` is currently broken on windows",
-)
 def test_generate_upload_data_with_none_network(mock_logger, tmp_path):
     (tmp_path / "coverage.xml").touch()
 
@@ -215,10 +209,6 @@ def test_generate_upload_data_with_none_network(mock_logger, tmp_path):
     assert len(res.file_fixes) > 1
 
 
-@pytest.mark.skipif(
-    sys.platform == "win32",
-    reason="the fallback `list_relevant_files` is currently broken on windows",
-)
 def test_generate_network_with_no_versioning_system(tmp_path):
     versioning_system = NoVersioningSystem()
     found_files = versioning_system.list_relevant_files()