Merge branch 'main' into scott/token-validation

Author: scott-codecov

codecov_cli/services/staticanalysis/__init__.py

@@ -3,7 +3,7 @@
 import logging
 import typing
 from functools import partial
-from multiprocessing import get_context
+from multiprocessing import Pool
 from pathlib import Path
 
 import click
@@ -187,7 +187,9 @@ async def process_files(
         length=len(files_to_analyze),
         label="Analyzing files",
     ) as bar:
-        with get_context("fork").Pool(processes=numberprocesses) as pool:
+        # https://docs.python.org/3/library/multiprocessing.html#contexts-and-start-methods
+        # from the link above, we want to use the default start methods
+        with Pool(processes=numberprocesses) as pool:
             file_results = pool.imap_unordered(mapped_func, files_to_analyze)
             for result in file_results:
                 bar.update(1, result)

codecov_cli/services/upload/upload_collector.py

@@ -112,6 +112,12 @@ def _get_file_fixes(
 
         try:
             with open(filename, "r") as f:
+                # If lineno is unset that means that the
+                # file is empty thus the eof should be 0
+                # so lineno will be set to -1 here
+                lineno = -1
+                # overwrite lineno in this for loop
+                # if f is empty, lineno stays at -1
                 for lineno, line_content in enumerate(f):
                     if any(
                         pattern.match(line_content)
@@ -123,7 +129,6 @@ def _get_file_fixes(
                         for pattern in fix_patterns_to_apply.without_reason
                     ):
                         fixed_lines_without_reason.add(lineno + 1)
-
                 if fix_patterns_to_apply.eof:
                     eof = lineno + 1
         except UnicodeDecodeError as err:

tests/services/static_analysis/test_static_analysis_service.py

@@ -32,9 +32,7 @@ async def test_process_files_with_error(self, mocker):
                 ],
             )
         )
-        mock_get_context = mocker.patch(
-            "codecov_cli.services.staticanalysis.get_context"
-        )
+        mock_pool = mocker.patch("codecov_cli.services.staticanalysis.Pool")
 
         def side_effect(config, filename: FileAnalysisRequest):
             if filename.result_filename == "correct_file.py":
@@ -59,12 +57,12 @@ def imap_side_effect(mapped_func, files):
                 results.append(mapped_func(file))
             return results
 
-        mock_get_context.return_value.Pool.return_value.__enter__.return_value.imap_unordered.side_effect = (
+        mock_pool.return_value.__enter__.return_value.imap_unordered.side_effect = (
             imap_side_effect
         )
 
         results = await process_files(files_found, 1, {})
-        mock_get_context.return_value.Pool.return_value.__enter__.return_value.imap_unordered.assert_called()
+        mock_pool.return_value.__enter__.return_value.imap_unordered.assert_called()
         assert mock_analyze_function.call_count == 2
         assert results == dict(
             all_data={"correct_file.py": {"hash": "abc123"}},