Mar 9, 2025 · Mar 8, 2025 · Mar 8, 2025 · Mar 8, 2025 · Mar 8, 2025 · Mar 8, 2025
diff --git a/tests/integration/test_config_system.py b/tests/integration/test_config_system.py

 from __future__ import annotations

 import tempfile
 from collections.abc import Generator
 from pathlib import Path

 import pytest
 import pathlib

 from vcspull.config.loader import load_config, resolve_includes, save_config
 from vcspull.config.models import Repository, Settings, VCSPullConfig


 @pytest.fixture
 def temp_config_dir() -> Generator[Path, None, None]:
    """Create a temporary directory for config files.

    Returns
    -------
    Generator[Path, None, None]
        Temporary directory path
    """
    with tempfile.TemporaryDirectory() as temp_dir:
        yield Path(temp_dir)


 def test_complete_config_workflow(temp_config_dir: Path) -> None:
 def test_complete_config_workflow(tmp_path: pathlib.Path) -> None:
    """Test the complete configuration workflow from creation to resolution."""
    # 1. Create a multi-level configuration setup

            Repository(
                name="repo1",
                url="https://github.com/example/repo1.git",
                path=str(temp_config_dir / "repos/repo1"),
                path=str(tmp_path / "repos/repo1"),
                vcs="git",
            ),
            Repository(
                name="repo2",
                url="https://github.com/example/repo2.git",
                path=str(temp_config_dir / "repos/repo2"),
                path=str(tmp_path / "repos/repo2"),
                vcs="git",
            ),
        ],
            Repository(
                name="hg-repo1",
                url="https://hg.example.org/repo1",
                path=str(temp_config_dir / "repos/hg-repo1"),
                path=str(tmp_path / "repos/hg-repo1"),
                vcs="hg",
            ),
        ],
            Repository(
                name="nested-repo",
                url="https://github.com/example/nested-repo.git",
                path=str(temp_config_dir / "repos/nested-repo"),
                path=str(tmp_path / "repos/nested-repo"),
                vcs="git",
            ),
            Repository(
                name="svn-repo",
                url="svn://svn.example.org/repo",
                path=str(temp_config_dir / "repos/svn-repo"),
                path=str(tmp_path / "repos/svn-repo"),
                vcs="svn",
            ),
        ],
    # 2. Save all config files

    # Create nested directory
    nested_dir =temp_config_dir / "nested"
    nested_dir =tmp_path / "nested"
    nested_dir.mkdir(exist_ok=True)

    # Save all configs
    base_path =temp_config_dir / "vcspull.yaml"
    repos1_path =temp_config_dir / "repos1.yaml"
    repos2_path =temp_config_dir / "repos2.yaml"
    base_path =tmp_path / "vcspull.yaml"
    repos1_path =tmp_path / "repos1.yaml"
    repos2_path =tmp_path / "repos2.yaml"
    nested_path = nested_dir / "more-repos.yaml"

    save_config(base_config, base_path)

    # Verify all paths are absolute
    for repo in resolved_config.repositories:
        assert Path(repo.path).is_absolute()
        assertpathlib.Path(repo.path).is_absolute()

    # 5. Test saving the resolved config

    resolved_path =temp_config_dir / "resolved.yaml"
    resolved_path =tmp_path / "resolved.yaml"
    save_config(resolved_config, resolved_path)

    # 6. Load the saved resolved config and verify
    assert len(final_config.repositories) == 5


 def test_missing_include_handling(temp_config_dir:Path) -> None:
 def test_missing_include_handling(tmp_path: pathlib.Path) -> None:
    """Test that missing includes are handled gracefully."""
    # Create a config with a non-existent include
    config = VCSPullConfig(
            Repository(
                name="repo1",
                url="https://github.com/example/repo1.git",
                path=str(temp_config_dir / "repos/repo1"),
                path=str(tmp_path / "repos/repo1"),
            ),
        ],
        includes=["missing.yaml"],
    )

    # Save the config
    config_path =temp_config_dir / "config.yaml"
    config_path =tmp_path / "config.yaml"
    save_config(config, config_path)

    # Load and resolve includes
    loaded_config = load_config(config_path)
    resolved_config = resolve_includes(loaded_config,temp_config_dir)
    resolved_config = resolve_includes(loaded_config,tmp_path)

    # The config should still contain the original repository
    assert len(resolved_config.repositories) == 1
    assert len(resolved_config.includes) == 0


 def test_circular_include_prevention(temp_config_dir:Path) -> None:
 def test_circular_include_prevention(tmp_path: pathlib.Path) -> None:
    """Test that circular includes don't cause infinite recursion."""
    # Create configs that include each other
    config1 = VCSPullConfig(
        repositories=[
            Repository(
                name="repo1",
                url="https://github.com/example/repo1.git",
                path=str(temp_config_dir / "repos/repo1"),
                path=str(tmp_path / "repos/repo1"),
            ),
        ],
        includes=["config2.yaml"],
            Repository(
                name="repo2",
                url="https://github.com/example/repo2.git",
                path=str(temp_config_dir / "repos/repo2"),
                path=str(tmp_path / "repos/repo2"),
            ),
        ],
        includes=["config1.yaml"],  # Creates a circular reference
    )

    # Save both configs
    config1_path =temp_config_dir / "config1.yaml"
    config2_path =temp_config_dir / "config2.yaml"
    config1_path =tmp_path / "config1.yaml"
    config2_path =tmp_path / "config2.yaml"
    save_config(config1, config1_path)
    save_config(config2, config2_path)

    # Load and resolve includes for the first config
    loaded_config = load_config(config1_path)
    resolved_config = resolve_includes(loaded_config,temp_config_dir)
    resolved_config = resolve_includes(loaded_config,tmp_path)

    # The repositories might contain duplicates due to circular references
    # Get the unique URLs to check if both repos are included
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,30 +6,13 @@

		from __future__ import annotations

		import tempfile
		from collections.abc import Generator
		from pathlib import Path

		import pytest
		import pathlib

		from vcspull.config.loader import load_config, resolve_includes, save_config
		from vcspull.config.models import Repository, Settings, VCSPullConfig


		@pytest.fixture
		def temp_config_dir() -> Generator[Path, None, None]:
		"""Create a temporary directory for config files.

		Returns
		-------
		Generator[Path, None, None]
		Temporary directory path
		"""
		with tempfile.TemporaryDirectory() as temp_dir:
		yield Path(temp_dir)


		def test_complete_config_workflow(temp_config_dir: Path) -> None:
		def test_complete_config_workflow(tmp_path: pathlib.Path) -> None:
		"""Test the complete configuration workflow from creation to resolution."""
		# 1. Create a multi-level configuration setup

Expand All		@@ -49,13 +32,13 @@ def test_complete_config_workflow(temp_config_dir: Path) -> None:
		Repository(
		name="repo1",
		url="https://github.com/example/repo1.git",
		path=str(temp_config_dir / "repos/repo1"),
		path=str(tmp_path / "repos/repo1"),
		vcs="git",
		),
		Repository(
		name="repo2",
		url="https://github.com/example/repo2.git",
		path=str(temp_config_dir / "repos/repo2"),
		path=str(tmp_path / "repos/repo2"),
		vcs="git",
		),
		],
Expand All		@@ -68,7 +51,7 @@ def test_complete_config_workflow(temp_config_dir: Path) -> None:
		Repository(
		name="hg-repo1",
		url="https://hg.example.org/repo1",
		path=str(temp_config_dir / "repos/hg-repo1"),
		path=str(tmp_path / "repos/hg-repo1"),
		vcs="hg",
		),
		],
Expand All		@@ -80,13 +63,13 @@ def test_complete_config_workflow(temp_config_dir: Path) -> None:
		Repository(
		name="nested-repo",
		url="https://github.com/example/nested-repo.git",
		path=str(temp_config_dir / "repos/nested-repo"),
		path=str(tmp_path / "repos/nested-repo"),
		vcs="git",
		),
		Repository(
		name="svn-repo",
		url="svn://svn.example.org/repo",
		path=str(temp_config_dir / "repos/svn-repo"),
		path=str(tmp_path / "repos/svn-repo"),
		vcs="svn",
		),
		],
Expand All		@@ -95,13 +78,13 @@ def test_complete_config_workflow(temp_config_dir: Path) -> None:
		# 2. Save all config files

		# Create nested directory
		nested_dir =temp_config_dir / "nested"
		nested_dir =tmp_path / "nested"
		nested_dir.mkdir(exist_ok=True)

		# Save all configs
		base_path =temp_config_dir / "vcspull.yaml"
		repos1_path =temp_config_dir / "repos1.yaml"
		repos2_path =temp_config_dir / "repos2.yaml"
		base_path =tmp_path / "vcspull.yaml"
		repos1_path =tmp_path / "repos1.yaml"
		repos2_path =tmp_path / "repos2.yaml"
		nested_path = nested_dir / "more-repos.yaml"

		save_config(base_config, base_path)
Expand DownExpand Up		@@ -134,11 +117,11 @@ def test_complete_config_workflow(temp_config_dir: Path) -> None:

		# Verify all paths are absolute
		for repo in resolved_config.repositories:
		assert Path(repo.path).is_absolute()
		assertpathlib.Path(repo.path).is_absolute()

		# 5. Test saving the resolved config

		resolved_path =temp_config_dir / "resolved.yaml"
		resolved_path =tmp_path / "resolved.yaml"
		save_config(resolved_config, resolved_path)

		# 6. Load the saved resolved config and verify
Expand All		@@ -152,7 +135,7 @@ def test_complete_config_workflow(temp_config_dir: Path) -> None:
		assert len(final_config.repositories) == 5


		def test_missing_include_handling(temp_config_dir:Path) -> None:
		def test_missing_include_handling(tmp_path: pathlib.Path) -> None:
		"""Test that missing includes are handled gracefully."""
		# Create a config with a non-existent include
		config = VCSPullConfig(
Expand All		@@ -161,19 +144,19 @@ def test_missing_include_handling(temp_config_dir: Path) -> None:
		Repository(
		name="repo1",
		url="https://github.com/example/repo1.git",
		path=str(temp_config_dir / "repos/repo1"),
		path=str(tmp_path / "repos/repo1"),
		),
		],
		includes=["missing.yaml"],
		)

		# Save the config
		config_path =temp_config_dir / "config.yaml"
		config_path =tmp_path / "config.yaml"
		save_config(config, config_path)

		# Load and resolve includes
		loaded_config = load_config(config_path)
		resolved_config = resolve_includes(loaded_config,temp_config_dir)
		resolved_config = resolve_includes(loaded_config,tmp_path)

		# The config should still contain the original repository
		assert len(resolved_config.repositories) == 1
Expand All		@@ -183,15 +166,15 @@ def test_missing_include_handling(temp_config_dir: Path) -> None:
		assert len(resolved_config.includes) == 0


		def test_circular_include_prevention(temp_config_dir:Path) -> None:
		def test_circular_include_prevention(tmp_path: pathlib.Path) -> None:
		"""Test that circular includes don't cause infinite recursion."""
		# Create configs that include each other
		config1 = VCSPullConfig(
		repositories=[
		Repository(
		name="repo1",
		url="https://github.com/example/repo1.git",
		path=str(temp_config_dir / "repos/repo1"),
		path=str(tmp_path / "repos/repo1"),
		),
		],
		includes=["config2.yaml"],
Expand All		@@ -202,21 +185,21 @@ def test_circular_include_prevention(temp_config_dir: Path) -> None:
		Repository(
		name="repo2",
		url="https://github.com/example/repo2.git",
		path=str(temp_config_dir / "repos/repo2"),
		path=str(tmp_path / "repos/repo2"),
		),
		],
		includes=["config1.yaml"], # Creates a circular reference
		)

		# Save both configs
		config1_path =temp_config_dir / "config1.yaml"
		config2_path =temp_config_dir / "config2.yaml"
		config1_path =tmp_path / "config1.yaml"
		config2_path =tmp_path / "config2.yaml"
		save_config(config1, config1_path)
		save_config(config2, config2_path)

		# Load and resolve includes for the first config
		loaded_config = load_config(config1_path)
		resolved_config = resolve_includes(loaded_config,temp_config_dir)
		resolved_config = resolve_includes(loaded_config,tmp_path)

		# The repositories might contain duplicates due to circular references
		# Get the unique URLs to check if both repos are included
Expand Down