<!-- CURSOR_SUMMARY --> > [!NOTE] > **Medium Risk** > Touches authentication/login flow, credentials-file permissions, and subprocess lifecycle behavior across platforms; while mostly defensive, regressions could impact login or process management on Windows/macOS runners. > > **Overview** > Improves Windows/cross-platform reliability across the CLI and MCP server: OAuth login now binds the callback server to `127.0.0.1`, avoids slow loopback reverse-DNS, adds a configurable callback timeout (`--timeout` + env default), and opens URLs via a Windows-friendly `_open_browser` to avoid flashing console windows. > > Centralizes CLI output via a shared `console` that forces UTF-8 on Windows, standardizes UTF-8 file reads/writes throughout, tightens credentials-file permissions on Windows using `icacls`, and adds shared Windows subprocess helpers for **no-window** process creation and graceful termination (used by `deploy`, MCP reload, and usage-tracking worker). > > Updates client configuration UX/robustness (Windows AppData resolution via `platformdirs`, Cursor config path fallbacks + compatibility writes, overwrite warnings, absolute `uv` path for GUI clients, safer path display) and improves `deploy` child-process handling to avoid pipe-buffer deadlocks while giving better debug-aware error messages. > > Expands CI to run tests on Linux/Windows/macOS, adds a no-auth CLI integration workflow, disables usage tracking in toolkits CI, and adds extensive regression tests for Windows signals, subprocess cleanup, UTF-8, and config-path edge cases; bumps `arcade-core` to `4.4.2` and `arcade-mcp-server` to `1.17.2` (with updated dependency pin). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 0fabd8ca1cd647039ba6ddbdf3f7809c330bab9e. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
655 lines
24 KiB
Python
655 lines
24 KiB
Python
from pathlib import Path
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
from arcade_core.errors import ToolkitLoadError
|
|
from arcade_core.toolkit import Toolkit, Validate
|
|
|
|
|
|
class TestToolkit:
|
|
"""Test the Toolkit class functionality."""
|
|
|
|
def test_strip_arcade_prefix_validator(self):
|
|
"""Test that the name validator strips the arcade_ prefix."""
|
|
toolkit = Toolkit(
|
|
name="arcade_test",
|
|
package_name="arcade_test",
|
|
description="Test toolkit",
|
|
version="1.0.0",
|
|
)
|
|
assert toolkit.name == "test"
|
|
|
|
def test_no_arcade_prefix_unchanged(self):
|
|
"""Test that names without arcade_ prefix remain unchanged."""
|
|
toolkit = Toolkit(
|
|
name="mytest",
|
|
package_name="mytest",
|
|
description="Test toolkit",
|
|
version="1.0.0",
|
|
)
|
|
assert toolkit.name == "mytest"
|
|
|
|
def test_strip_arcade_prefix_method(self):
|
|
"""Test the _strip_arcade_prefix static method."""
|
|
assert Toolkit._strip_arcade_prefix("arcade_test") == "test"
|
|
assert Toolkit._strip_arcade_prefix("test") == "test"
|
|
assert Toolkit._strip_arcade_prefix("arcade_my_toolkit") == "my_toolkit"
|
|
assert Toolkit._strip_arcade_prefix("myarcade_toolkit") == "myarcade_toolkit"
|
|
assert Toolkit._strip_arcade_prefix("") == ""
|
|
assert Toolkit._strip_arcade_prefix("arcade_") == ""
|
|
|
|
|
|
class TestFromEntrypoint:
|
|
"""Test the from_entrypoint class method."""
|
|
|
|
@patch("arcade_core.toolkit.Toolkit.from_package")
|
|
def test_from_entrypoint_success(self, mock_from_package):
|
|
"""Test successful creation of toolkit from entry point."""
|
|
# Create mock entry point with dist
|
|
mock_entry = MagicMock()
|
|
mock_entry.value = "my_toolkit"
|
|
mock_entry.name = "toolkit_name"
|
|
mock_entry.dist = MagicMock()
|
|
mock_entry.dist.name = "my-toolkit"
|
|
|
|
# Mock the from_package return
|
|
mock_toolkit = Toolkit(
|
|
name="my_toolkit",
|
|
package_name="my-toolkit",
|
|
version="1.2.3",
|
|
description="My test toolkit",
|
|
author=["Test Author"],
|
|
homepage="https://github.com/test/toolkit",
|
|
)
|
|
mock_from_package.return_value = mock_toolkit
|
|
|
|
toolkit = Toolkit.from_entrypoint(mock_entry)
|
|
|
|
mock_from_package.assert_called_once_with("my-toolkit")
|
|
assert toolkit.name == "my_toolkit"
|
|
assert toolkit.package_name == "my-toolkit"
|
|
|
|
def test_from_entrypoint_no_dist(self):
|
|
"""Test handling when entry point has no dist attribute."""
|
|
# Create mock entry point without dist
|
|
mock_entry = MagicMock()
|
|
mock_entry.value = "my_toolkit"
|
|
mock_entry.name = "toolkit_name"
|
|
mock_entry.dist = None
|
|
|
|
with pytest.raises(ToolkitLoadError, match="does not have distribution metadata"):
|
|
Toolkit.from_entrypoint(mock_entry)
|
|
|
|
|
|
class TestFindArcadeToolkitsFromEntrypoints:
|
|
"""Test the find_arcade_toolkits_from_entrypoints method."""
|
|
|
|
@patch("arcade_core.toolkit.importlib.metadata.entry_points")
|
|
@patch("arcade_core.toolkit.Toolkit.from_entrypoint")
|
|
def test_find_from_entrypoints_success(self, mock_from_ep, mock_entry_points):
|
|
"""Test successful discovery of toolkits from entry points."""
|
|
# Create mock entry points
|
|
mock_ep1 = MagicMock()
|
|
mock_ep1.name = "toolkit_name"
|
|
mock_ep1.value = "toolkit1"
|
|
mock_ep2 = MagicMock()
|
|
mock_ep2.name = "toolkit_name"
|
|
mock_ep2.value = "toolkit2"
|
|
|
|
mock_entry_points.return_value = [mock_ep1, mock_ep2]
|
|
|
|
# Create mock toolkits
|
|
toolkit1 = Toolkit(
|
|
name="toolkit1",
|
|
package_name="toolkit1",
|
|
version="1.0.0",
|
|
description="Toolkit 1",
|
|
)
|
|
toolkit2 = Toolkit(
|
|
name="toolkit2",
|
|
package_name="toolkit2",
|
|
version="1.0.0",
|
|
description="Toolkit 2",
|
|
)
|
|
mock_from_ep.side_effect = [toolkit1, toolkit2]
|
|
|
|
toolkits = Toolkit.find_arcade_toolkits_from_entrypoints()
|
|
|
|
assert len(toolkits) == 2
|
|
assert toolkits[0].name == "toolkit1"
|
|
assert toolkits[1].name == "toolkit2"
|
|
|
|
@patch("arcade_core.toolkit.importlib.metadata.entry_points")
|
|
@patch("arcade_core.toolkit.Toolkit.from_entrypoint")
|
|
def test_find_from_entrypoints_with_errors(self, mock_from_ep, mock_entry_points):
|
|
"""Test that errors in loading individual toolkits are handled gracefully."""
|
|
# Create mock entry points
|
|
mock_ep1 = MagicMock()
|
|
mock_ep1.name = "toolkit_name"
|
|
mock_ep1.value = "toolkit1"
|
|
mock_ep2 = MagicMock()
|
|
mock_ep2.name = "toolkit_name"
|
|
mock_ep2.value = "toolkit2"
|
|
mock_ep3 = MagicMock()
|
|
mock_ep3.name = "toolkit_name"
|
|
mock_ep3.value = "toolkit3"
|
|
mock_entry_points.return_value = [mock_ep1, mock_ep2, mock_ep3]
|
|
|
|
# Create mock toolkits
|
|
toolkit1 = Toolkit(
|
|
name="toolkit1",
|
|
package_name="toolkit1",
|
|
version="1.0.0",
|
|
description="Toolkit 1",
|
|
)
|
|
toolkit3 = Toolkit(
|
|
name="toolkit3",
|
|
package_name="toolkit3",
|
|
version="1.0.0",
|
|
description="Toolkit 3",
|
|
)
|
|
mock_from_ep.side_effect = [toolkit1, ToolkitLoadError("Failed to load toolkit2"), toolkit3]
|
|
|
|
toolkits = Toolkit.find_arcade_toolkits_from_entrypoints()
|
|
|
|
assert len(toolkits) == 2
|
|
assert toolkits[0].name == "toolkit1"
|
|
assert toolkits[1].name == "toolkit3"
|
|
|
|
@patch("arcade_core.toolkit.importlib.metadata.entry_points")
|
|
def test_find_from_entrypoints_no_group(self, mock_entry_points):
|
|
"""Test when arcade_toolkits entry point group doesn't exist."""
|
|
# Mock entry_points to return empty list
|
|
mock_entry_points.return_value = []
|
|
|
|
# Test
|
|
toolkits = Toolkit.find_arcade_toolkits_from_entrypoints()
|
|
|
|
assert toolkits == []
|
|
|
|
|
|
class TestFindAllArcadeToolkits:
|
|
"""Test the combined toolkit discovery method."""
|
|
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_entrypoints")
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_prefix")
|
|
def test_find_all_no_duplicates(self, mock_find_prefix, mock_find_ep):
|
|
"""Test that find_all returns combined results without duplicates."""
|
|
# Create mock toolkits
|
|
toolkit1 = Toolkit(
|
|
name="toolkit1",
|
|
package_name="toolkit1",
|
|
version="1.0.0",
|
|
description="Toolkit 1",
|
|
)
|
|
toolkit2 = Toolkit(
|
|
name="toolkit2",
|
|
package_name="toolkit2",
|
|
version="1.0.0",
|
|
description="Toolkit 2",
|
|
)
|
|
# Mock the discovery methods
|
|
mock_find_ep.return_value = [toolkit1]
|
|
mock_find_prefix.return_value = [toolkit2]
|
|
|
|
toolkits = Toolkit.find_all_arcade_toolkits()
|
|
|
|
assert len(toolkits) == 2
|
|
assert any(t.name == "toolkit1" for t in toolkits)
|
|
assert any(t.name == "toolkit2" for t in toolkits)
|
|
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_entrypoints")
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_prefix")
|
|
def test_find_all_with_duplicates_prefers_entrypoint(self, mock_find_prefix, mock_find_ep):
|
|
"""Test that entry point toolkits are preferred over prefix-based ones."""
|
|
toolkit_ep = Toolkit(
|
|
name="test",
|
|
package_name="arcade_test", # Same package name
|
|
version="2.0.0",
|
|
description="Entry point version",
|
|
)
|
|
|
|
toolkit_prefix = Toolkit(
|
|
name="test",
|
|
package_name="arcade_test", # Same package name
|
|
version="1.0.0",
|
|
description="Prefix version",
|
|
)
|
|
# Mock the discovery methods
|
|
mock_find_ep.return_value = [toolkit_ep]
|
|
mock_find_prefix.return_value = [toolkit_prefix]
|
|
|
|
toolkits = Toolkit.find_all_arcade_toolkits()
|
|
|
|
assert len(toolkits) == 1
|
|
assert toolkits[0].version == "2.0.0"
|
|
assert toolkits[0].description == "Entry point version"
|
|
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_entrypoints")
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_prefix")
|
|
def test_find_all_empty(self, mock_find_prefix, mock_find_ep):
|
|
"""Test when no toolkits are found."""
|
|
mock_find_ep.return_value = []
|
|
mock_find_prefix.return_value = []
|
|
|
|
toolkits = Toolkit.find_all_arcade_toolkits()
|
|
assert toolkits == []
|
|
|
|
|
|
class TestEntryPointCompatibility:
|
|
"""Test compatibility scenarios for entry point discovery."""
|
|
|
|
@patch("arcade_core.toolkit.importlib.metadata.entry_points")
|
|
@patch("arcade_core.toolkit.Toolkit.from_entrypoint")
|
|
def test_duplicate_toolkit_names_in_entrypoints(self, mock_from_ep, mock_entry_points):
|
|
"""Test handling of duplicate toolkit names in entry points."""
|
|
# Create mock entry points with same name
|
|
mock_ep1 = MagicMock()
|
|
mock_ep1.name = "toolkit_name"
|
|
mock_ep1.value = "test_v1"
|
|
|
|
mock_ep2 = MagicMock()
|
|
mock_ep2.name = "toolkit_name"
|
|
mock_ep2.value = "test_v2"
|
|
|
|
mock_entry_points.return_value = [mock_ep1, mock_ep2]
|
|
|
|
# Mock toolkit creation - both with same toolkit name
|
|
toolkit1 = Toolkit(
|
|
name="test",
|
|
package_name="test_v1",
|
|
version="1.0.0",
|
|
description="Test v1",
|
|
)
|
|
|
|
toolkit2 = Toolkit(
|
|
name="test",
|
|
package_name="test_v2",
|
|
version="2.0.0",
|
|
description="Test v2",
|
|
)
|
|
|
|
mock_from_ep.side_effect = [toolkit1, toolkit2]
|
|
|
|
# Should return both even with same display name
|
|
toolkits = Toolkit.find_arcade_toolkits_from_entrypoints()
|
|
assert len(toolkits) == 2
|
|
|
|
@patch("arcade_core.toolkit.Toolkit.from_package")
|
|
def test_from_entrypoint_with_arcade_prefix(self, mock_from_package):
|
|
"""Test that arcade_ prefix is stripped from entry point toolkits."""
|
|
# Create mock entry point
|
|
mock_entry = MagicMock()
|
|
mock_entry.value = "arcade_example"
|
|
mock_entry.name = "toolkit_name"
|
|
mock_entry.dist = MagicMock()
|
|
mock_entry.dist.name = "arcade-example"
|
|
|
|
# Mock the from_package return
|
|
mock_toolkit = Toolkit(
|
|
name="arcade_example",
|
|
package_name="arcade-example",
|
|
version="1.0.0",
|
|
description="Example toolkit",
|
|
)
|
|
mock_from_package.return_value = mock_toolkit
|
|
|
|
toolkit = Toolkit.from_entrypoint(mock_entry)
|
|
|
|
assert toolkit.name == "example"
|
|
assert toolkit.package_name == "arcade-example"
|
|
|
|
|
|
class TestToolkitIntegration:
|
|
"""Integration tests for toolkit discovery and loading."""
|
|
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_entrypoints")
|
|
@patch("arcade_core.toolkit.Toolkit.find_arcade_toolkits_from_prefix")
|
|
def test_mixed_toolkit_sources(self, mock_find_prefix, mock_find_ep):
|
|
"""Test discovering toolkits from both sources with various naming patterns."""
|
|
# Create toolkits with different naming patterns
|
|
ep_toolkit1 = Toolkit(
|
|
name="custom",
|
|
package_name="my_custom_toolkit",
|
|
version="1.0.0",
|
|
description="Custom toolkit",
|
|
)
|
|
ep_toolkit2 = Toolkit(
|
|
name="utils",
|
|
package_name="arcade_utils",
|
|
version="2.0.0",
|
|
description="Utils toolkit",
|
|
)
|
|
prefix_toolkit1 = Toolkit(
|
|
name="legacy",
|
|
package_name="arcade_legacy",
|
|
version="1.0.0",
|
|
description="Legacy toolkit",
|
|
)
|
|
prefix_toolkit2 = Toolkit(
|
|
name="utils",
|
|
package_name="arcade_utils", # Same package name as ep_toolkit2
|
|
version="0.9.0",
|
|
description="Old utils toolkit",
|
|
)
|
|
mock_find_ep.return_value = [ep_toolkit1, ep_toolkit2]
|
|
mock_find_prefix.return_value = [prefix_toolkit1, prefix_toolkit2]
|
|
|
|
toolkits = Toolkit.find_all_arcade_toolkits()
|
|
|
|
# Should have 3 toolkits (ep_toolkit2 supersedes prefix_toolkit2 due to same package_name)
|
|
assert len(toolkits) == 3
|
|
names = {t.name for t in toolkits}
|
|
assert names == {"custom", "utils", "legacy"}
|
|
utils_toolkit = next(t for t in toolkits if t.name == "utils")
|
|
assert utils_toolkit.version == "2.0.0"
|
|
|
|
|
|
@pytest.fixture
|
|
def cleanup_test_files():
|
|
test_files = ["valid.py", "invalid.py", "test.txt"]
|
|
|
|
# Run the test
|
|
yield
|
|
|
|
# Clean up test files after the test
|
|
for file in test_files:
|
|
try: # noqa: SIM105
|
|
Path(file).unlink(missing_ok=True)
|
|
except Exception: # noqa: S110
|
|
pass
|
|
|
|
|
|
class TestValidateFile:
|
|
@pytest.mark.usefixtures("cleanup_test_files")
|
|
def test_validate_file(self):
|
|
"""Test validation of Python files with valid syntax."""
|
|
# Create a temporary valid Python file
|
|
valid_file = Path("valid.py")
|
|
valid_file.write_text("def test(): return True", encoding="utf-8")
|
|
|
|
# Should not raise any exceptions
|
|
Toolkit.validate_file(valid_file)
|
|
# Test with string path
|
|
Toolkit.validate_file(str(valid_file))
|
|
|
|
def test_validate_tools_nonexistent_file(self):
|
|
"""Test validation with non-existent file."""
|
|
nonexistent = Path("nonexistent.py")
|
|
|
|
with pytest.raises(ValueError, match="File not found"):
|
|
Toolkit.validate_file(nonexistent)
|
|
|
|
@pytest.mark.usefixtures("cleanup_test_files")
|
|
def test_validate_tools_non_python_file(self):
|
|
"""Test validation with non-Python file."""
|
|
txt_file = Path("test.txt")
|
|
txt_file.write_text("Not a Python file", encoding="utf-8")
|
|
|
|
with pytest.raises(ValueError, match="Not a Python file"):
|
|
Toolkit.validate_file(txt_file)
|
|
|
|
@pytest.mark.usefixtures("cleanup_test_files")
|
|
def test_validate_tools_syntax_error(self):
|
|
"""Test validation with Python file containing syntax errors."""
|
|
invalid_file = Path("invalid.py")
|
|
invalid_file.write_text("def test(): return True:", encoding="utf-8") # Invalid syntax
|
|
|
|
with pytest.raises(SyntaxError):
|
|
Toolkit.validate_file(invalid_file)
|
|
|
|
|
|
class TestValidPath:
|
|
"""Test the Validate.path function for path validation during deployment and serving."""
|
|
|
|
@pytest.mark.parametrize(
|
|
"path_input",
|
|
[
|
|
# Simple valid paths
|
|
"file.py",
|
|
"module.py",
|
|
"utils.py",
|
|
"main.py",
|
|
"README.md",
|
|
"config.json",
|
|
# Valid nested paths
|
|
"src/main.py",
|
|
"lib/utils/helper.py",
|
|
"package/subpackage/module.py",
|
|
"tools/scripts/deploy.py",
|
|
"docs/api/reference.md",
|
|
"tests/unit/test_module.py",
|
|
# Deep nested paths
|
|
"very/deep/nested/directory/structure/file.py",
|
|
"a/b/c/d/e/f/g/module.py",
|
|
# Edge cases
|
|
"", # Path("") creates current directory path "."
|
|
"a",
|
|
"1",
|
|
# Files containing but not matching restricted patterns
|
|
"my_dist_file.py", # contains "dist" but doesn't match exactly
|
|
"build_utils.py", # contains "build" but doesn't match exactly
|
|
"lockfile.py", # contains "lock" but doesn't end with .lock
|
|
"unlock.py", # contains "lock" but doesn't end with .lock
|
|
# Case sensitivity - these should be valid because case doesn't match exactly
|
|
"DIST/file.py", # "DIST" != "dist"
|
|
"Build/file.py", # "Build" != "build"
|
|
"VENV/file.py", # "VENV" != "venv"
|
|
"Package.LOCK", # ".LOCK" != ".lock"
|
|
# Windows-style paths
|
|
"src\\module.py",
|
|
"lib\\utils\\helper.py",
|
|
# Absolute paths that should be valid
|
|
"/home/user/project/file.py",
|
|
# Unicode and special characters
|
|
"файл.py", # Cyrillic
|
|
"文件.py", # Chinese
|
|
"módulo.py", # Accented characters
|
|
"file with spaces.py",
|
|
"file-with-dashes.py",
|
|
"file_with_underscores.py",
|
|
# Path objects
|
|
Path("file.py"),
|
|
Path("src/module.py"),
|
|
],
|
|
)
|
|
def test_valid_paths(self, path_input):
|
|
"""Test that valid paths are accepted."""
|
|
assert Validate.path(path_input) is True
|
|
|
|
@pytest.mark.parametrize(
|
|
"path_input",
|
|
[
|
|
# Excluded directories (exact matches)
|
|
"dist",
|
|
"build",
|
|
"__pycache__",
|
|
"coverage.xml",
|
|
# Paths containing excluded directories
|
|
"dist/bundle.js",
|
|
"build/output/file.py",
|
|
"src/__pycache__/module.cpython-39.pyc",
|
|
"project/build/artifacts/file.py",
|
|
"lib/dist/package/module.py",
|
|
# Lock files (ending with .lock)
|
|
"package.lock",
|
|
"poetry.lock",
|
|
"requirements.lock",
|
|
"Pipfile.lock",
|
|
"yarn.lock",
|
|
"npm.lock",
|
|
"custom.lock",
|
|
# Lock files in nested paths
|
|
"src/package.lock",
|
|
"frontend/yarn.lock",
|
|
"backend/poetry.lock",
|
|
"deep/nested/path/file.lock",
|
|
# Windows-style paths that should be invalid
|
|
"dist\\bundle.js",
|
|
"src\\package.lock",
|
|
# Absolute paths that should be invalid
|
|
"/home/user/project/dist/file.py",
|
|
"/opt/project/package.lock",
|
|
# Unicode with exclusion patterns
|
|
"文件.lock", # Chinese lock file
|
|
# Path objects
|
|
Path("dist/bundle.js"),
|
|
Path("package.lock"),
|
|
],
|
|
)
|
|
def test_invalid_paths(self, path_input):
|
|
"""Test that invalid paths are rejected."""
|
|
assert Validate.path(path_input) is False
|
|
|
|
|
|
class TestToolsFromDirectory:
|
|
"""Test the tools_from_directory skip logic for entrypoint files.
|
|
|
|
It has two conditions:
|
|
1. File path match: module_path.resolve() == current_file
|
|
2. Module name match: full_import_path == current_module_name
|
|
"""
|
|
|
|
@pytest.fixture
|
|
def temp_package(self, tmp_path):
|
|
"""Create a temporary package with Python files containing tools."""
|
|
package_dir = tmp_path / "mypackage"
|
|
package_dir.mkdir()
|
|
|
|
(package_dir / "__init__.py").write_text("", encoding="utf-8")
|
|
(package_dir / "entrypoint.py").write_text(
|
|
'''
|
|
from arcade_mcp_server import tool
|
|
|
|
@tool
|
|
def my_tool():
|
|
"""A tool."""
|
|
pass
|
|
''',
|
|
encoding="utf-8",
|
|
)
|
|
tools_dir = package_dir / "tools"
|
|
tools_dir.mkdir()
|
|
(tools_dir / "__init__.py").write_text("", encoding="utf-8")
|
|
(tools_dir / "helper.py").write_text(
|
|
'''
|
|
from arcade_mcp_server import tool
|
|
|
|
@tool
|
|
def helper_tool():
|
|
"""A helper tool."""
|
|
pass
|
|
''',
|
|
encoding="utf-8",
|
|
)
|
|
|
|
return package_dir
|
|
|
|
@patch("arcade_core.toolkit.get_tools_from_file")
|
|
def test_skips_file_when_path_matches(self, mock_get_tools, temp_package):
|
|
"""Verify skip when __main__.__file__ matches module path (original behavior)."""
|
|
mock_get_tools.return_value = ["some_tool"]
|
|
entrypoint_path = temp_package / "entrypoint.py"
|
|
|
|
# Create mock __main__ module with matching file path
|
|
mock_main = MagicMock()
|
|
mock_main.__file__ = str(entrypoint_path)
|
|
mock_main.__spec__ = None
|
|
|
|
with patch.dict("sys.modules", {"__main__": mock_main}):
|
|
result = Toolkit.tools_from_directory(temp_package, "mypackage")
|
|
|
|
# entrypoint.py should be skipped, only tools/helper.py should be included
|
|
assert "mypackage.entrypoint" not in result
|
|
assert "mypackage.tools.helper" in result
|
|
|
|
@patch("arcade_core.toolkit.get_tools_from_file")
|
|
def test_skips_file_when_module_name_matches(self, mock_get_tools, temp_package):
|
|
"""Verify skip when __main__.__spec__.name matches even if paths differ.
|
|
|
|
This simulates deployment scenarios where the script runs from a bundle
|
|
but the package is installed in site-packages (different paths).
|
|
"""
|
|
mock_get_tools.return_value = ["some_tool"]
|
|
|
|
# Create mock __main__ module with different file path but matching module name
|
|
mock_main = MagicMock()
|
|
mock_main.__file__ = "/some/other/path/entrypoint.py" # Different path
|
|
mock_spec = MagicMock()
|
|
mock_spec.name = "mypackage.entrypoint" # but, matches the module being scanned
|
|
mock_main.__spec__ = mock_spec
|
|
|
|
with patch.dict("sys.modules", {"__main__": mock_main}):
|
|
result = Toolkit.tools_from_directory(temp_package, "mypackage")
|
|
|
|
# entrypoint.py should be skipped due to module name match
|
|
assert "mypackage.entrypoint" not in result
|
|
assert "mypackage.tools.helper" in result
|
|
|
|
@patch("arcade_core.toolkit.get_tools_from_file")
|
|
def test_no_skip_when_different_module(self, mock_get_tools, temp_package):
|
|
"""Verify unrelated modules are not skipped."""
|
|
mock_get_tools.return_value = ["some_tool"]
|
|
|
|
# Create mock __main__ module with completely different identity
|
|
mock_main = MagicMock()
|
|
mock_main.__file__ = "/some/other/path/other_script.py"
|
|
mock_spec = MagicMock()
|
|
mock_spec.name = "some_other_package.script"
|
|
mock_main.__spec__ = mock_spec
|
|
|
|
with patch.dict("sys.modules", {"__main__": mock_main}):
|
|
result = Toolkit.tools_from_directory(temp_package, "mypackage")
|
|
|
|
# Both files should be included since neither matches __main__
|
|
assert "mypackage.entrypoint" in result
|
|
assert "mypackage.tools.helper" in result
|
|
|
|
@patch("arcade_core.toolkit.get_tools_from_file")
|
|
def test_no_skip_when_no_main_module(self, mock_get_tools, temp_package):
|
|
"""Handle case where __main__ is not in sys.modules."""
|
|
mock_get_tools.return_value = ["some_tool"]
|
|
|
|
# Remove __main__ from sys.modules
|
|
with patch.dict("sys.modules", {"__main__": None}):
|
|
result = Toolkit.tools_from_directory(temp_package, "mypackage")
|
|
|
|
# Both files should be included
|
|
assert "mypackage.entrypoint" in result
|
|
assert "mypackage.tools.helper" in result
|
|
|
|
@patch("arcade_core.toolkit.get_tools_from_file")
|
|
def test_no_skip_when_no_spec(self, mock_get_tools, temp_package):
|
|
"""Handle case where __main__ has no __spec__ attribute."""
|
|
mock_get_tools.return_value = ["some_tool"]
|
|
|
|
# Create mock __main__ module with different file path and no __spec__
|
|
mock_main = MagicMock()
|
|
mock_main.__file__ = "/some/other/path/script.py"
|
|
mock_main.__spec__ = None
|
|
|
|
with patch.dict("sys.modules", {"__main__": mock_main}):
|
|
result = Toolkit.tools_from_directory(temp_package, "mypackage")
|
|
|
|
# Both files should be included since path doesn't match and no spec
|
|
assert "mypackage.entrypoint" in result
|
|
assert "mypackage.tools.helper" in result
|
|
|
|
@patch("arcade_core.toolkit.get_tools_from_file")
|
|
def test_no_skip_when_spec_has_no_name(self, mock_get_tools, temp_package):
|
|
"""Handle case where __main__.__spec__ exists but has no name."""
|
|
mock_get_tools.return_value = ["some_tool"]
|
|
|
|
# Create mock __main__ module with __spec__ but no name
|
|
mock_main = MagicMock()
|
|
mock_main.__file__ = "/some/other/path/script.py"
|
|
mock_spec = MagicMock()
|
|
mock_spec.name = None
|
|
mock_main.__spec__ = mock_spec
|
|
|
|
with patch.dict("sys.modules", {"__main__": mock_main}):
|
|
result = Toolkit.tools_from_directory(temp_package, "mypackage")
|
|
|
|
# Both files should be included
|
|
assert "mypackage.entrypoint" in result
|
|
assert "mypackage.tools.helper" in result
|