Skip to content

Commit

Permalink
fix: len(None) bug
Browse files Browse the repository at this point in the history
  • Loading branch information
joseph-sentry committed Feb 19, 2025
1 parent e4be32d commit a8113a2
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 3 deletions.
2 changes: 1 addition & 1 deletion codecov_cli/services/upload/network_finder.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def __init__(
def find_files(self, ignore_filters=False) -> typing.List[str]:
files = self.versioning_system.list_relevant_files(self.network_root_folder)

if not ignore_filters:
if files and not ignore_filters:
if self.network_filter:
files = [file for file in files if file.startswith(self.network_filter)]
if self.network_prefix:
Expand Down
2 changes: 1 addition & 1 deletion codecov_cli/services/upload/upload_collector.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ def generate_upload_data(
f"Found {len(report_files)} {report_type.value} files to report"
)
logger.debug(
f"Found {len(network)} network files to report, ({len(unfiltered_network)} without filtering)"
f"Found {len(network) if network else None} network files to report, ({len(unfiltered_network) if network else None} without filtering)"
)
if not report_files:
if report_type == ReportType.TEST_RESULTS:
Expand Down
32 changes: 31 additions & 1 deletion tests/services/upload/test_upload_collector.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from pathlib import Path
from unittest.mock import patch

from codecov_cli.helpers.versioning_systems import GitVersioningSystem
from codecov_cli.helpers.versioning_systems import (
GitVersioningSystem,
NoVersioningSystem,
)
from codecov_cli.services.upload.file_finder import FileFinder
from codecov_cli.services.upload.network_finder import NetworkFinder
from codecov_cli.services.upload.upload_collector import UploadCollector
Expand Down Expand Up @@ -174,3 +177,30 @@ def test_generate_upload_data(tmp_path):

for file in expected:
assert file in res.files


@patch("codecov_cli.services.upload.upload_collector.logger")
@patch.object(GitVersioningSystem, "get_network_root", return_value=None)
def test_generate_upload_data_with_none_network(
mock_get_network_root, mock_logger, tmp_path
):
(tmp_path / "coverage.xml").touch()

file_finder = FileFinder(tmp_path)
network_finder = NetworkFinder(NoVersioningSystem(), None, None, None)

collector = UploadCollector([], network_finder, file_finder, {})

res = collector.generate_upload_data()

mock_logger.debug.assert_any_call("Collecting relevant files")
mock_logger.debug.assert_any_call(
"Found None network files to report, (None without filtering)"
)

mock_logger.info.assert_any_call("Found 1 coverage files to report")
mock_logger.info.assert_any_call("> {}".format(tmp_path / "coverage.xml"))

assert res.network is None
assert len(res.files) == 1
assert len(res.file_fixes) == 0

0 comments on commit a8113a2

Please sign in to comment.