Fix testing related to the main module

.github/workflows/ubuntu-tests.yml

@@ -50,6 +50,7 @@ jobs:
         uv pip install --system \
           pytest \
           pytest-asyncio \
+          pytest-mock \
           -r requirements/requirements.in \
           -r requirements/requirements-help.in \
           -r requirements/requirements-playwright.in \

.github/workflows/windows-tests.yml

@@ -42,11 +42,10 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install uv
-        uv pip install --system pytest pytest-asyncio -r requirements/requirements.in -r requirements/requirements-help.in -r requirements/requirements-playwright.in '.[help,playwright]'
+        uv pip install --system pytest pytest-asyncio pytest-mock -r requirements/requirements.in -r requirements/requirements-help.in -r requirements/requirements-playwright.in '.[help,playwright]'
 
     - name: Run tests
       env:
         AIDER_ANALYTICS: false
       run: |
         pytest
-

aider/commands/lint.py

@@ -2,6 +2,7 @@
 
 from aider.commands.utils.base_command import BaseCommand
 from aider.commands.utils.helpers import format_command_result
+from aider.utils import expand_glob_patterns
 
 
 class LintCommand(BaseCommand):
@@ -11,7 +12,16 @@ class LintCommand(BaseCommand):
     @classmethod
     async def execute(cls, io, coder, args, **kwargs):
         """Execute the lint command with given parameters."""
-        fnames = kwargs.get("fnames", None)
+        fnames = None
+
+        # Get files from CLI arguments if available
+        system_args = kwargs.get("system_args")
+        if system_args:
+            cli_files = getattr(system_args, "files", []) or []
+            cli_file_arg = getattr(system_args, "file", []) or []
+            all_cli_files = cli_files + cli_file_arg
+            if all_cli_files:
+                fnames = expand_glob_patterns(all_cli_files)
 
         if not coder.repo:
             io.tool_error("No git repository found.")
@@ -21,7 +31,7 @@ async def execute(cls, io, coder, args, **kwargs):
             fnames = coder.get_inchat_relative_files()
 
         # If still no files, get all dirty files in the repo
-        if not fnames and coder.repo:
+        if not fnames:
             fnames = coder.repo.get_dirty_files()
 
         if not fnames:

aider/main.py

@@ -10,7 +10,6 @@
     pass
 
 import asyncio
-import glob
 import json
 import os
 import re
@@ -515,25 +514,6 @@ async def sanity_check_repo(repo, io):
     return False
 
 
-def expand_glob_patterns(patterns, root="."):
-    """Expand glob patterns in a list of file paths."""
-    expanded_files = []
-    for pattern in patterns:
-        # Check if the pattern contains glob characters
-        if any(c in pattern for c in "*?[]"):
-            # Use glob to expand the pattern
-            matches = glob.glob(pattern, recursive=True)
-            if matches:
-                expanded_files.extend(matches)
-            else:
-                # If no matches, keep the original pattern
-                expanded_files.append(pattern)
-        else:
-            # Not a glob pattern, keep as is
-            expanded_files.append(pattern)
-    return expanded_files
-
-
 PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
 log_file = None
 file_excludelist = {
@@ -841,12 +821,12 @@ def get_io(pretty):
 
     # Expand glob patterns in files and file arguments
     all_files = args.files + (args.file or [])
-    all_files = expand_glob_patterns(all_files)
+    all_files = utils.expand_glob_patterns(all_files)
     fnames = [str(Path(fn).resolve()) for fn in all_files]
 
     # Expand glob patterns in read arguments
     read_patterns = args.read or []
-    read_expanded = expand_glob_patterns(read_patterns)
+    read_expanded = utils.expand_glob_patterns(read_patterns)
     read_only_fnames = []
     for fn in read_expanded:
         path = Path(fn).expanduser().resolve()
@@ -1323,7 +1303,7 @@ def apply_model_overrides(model_name):
         return await graceful_exit(coder)
 
     if args.lint:
-        await coder.commands.cmd_lint(fnames=fnames)
+        await coder.commands.do_run("lint", "")
 
     if args.test:
         if not args.test_cmd:

aider/utils.py

@@ -1,3 +1,4 @@
+import glob
 import os
 import platform
 import shutil
@@ -14,6 +15,25 @@
 IMAGE_EXTENSIONS = {".png", ".jpg", ".jpeg", ".gif", ".bmp", ".tiff", ".webp", ".pdf"}
 
 
+def expand_glob_patterns(patterns):
+    """Expand glob patterns in a list of file paths."""
+    expanded_files = []
+    for pattern in patterns:
+        # Check if the pattern contains glob characters
+        if any(c in pattern for c in "*?[]"):
+            # Use glob to expand the pattern
+            matches = glob.glob(pattern, recursive=True)
+            if matches:
+                expanded_files.extend(matches)
+            else:
+                # If no matches, keep the original pattern
+                expanded_files.append(pattern)
+        else:
+            # Not a glob pattern, keep as is
+            expanded_files.append(pattern)
+    return expanded_files
+
+
 def _execute_fzf(input_data, multi=False):
     """
     Runs fzf as a subprocess, feeding it input_data.

requirements/requirements-dev.in

@@ -1,6 +1,7 @@
 pytest
 pytest-asyncio
 pytest-env
+pytest-mock
 pip-tools
 lox
 matplotlib

requirements/requirements-dev.txt

@@ -215,6 +215,7 @@ pytest==9.0.1
     #   -r requirements/requirements-dev.in
     #   pytest-asyncio
     #   pytest-env
+    #   pytest-mock
 pytest-asyncio==1.3.0
     # via
     #   -c requirements/common-constraints.txt
@@ -223,6 +224,10 @@ pytest-env==1.2.0
     # via
     #   -c requirements/common-constraints.txt
     #   -r requirements/requirements-dev.in
+pytest-mock==3.15.1
+    # via
+    #   -c requirements/common-constraints.txt
+    #   -r requirements/requirements-dev.in
 python-dateutil==2.9.0.post0
     # via
     #   -c requirements/common-constraints.txt