Merge pull request #35 from knitli/copilot/fix-test-harness-issues

bashandbone · web-flow · commit 7adbf5518f24 · 2025-10-27T12:37:13.000-04:00
Fix test collection namespace collision and apply consistent pytest marks
diff --git a/coverage.xml b/coverage.xml
diff --git a/pyproject.toml b/pyproject.toml
@@ -566,6 +566,7 @@ addopts = [
   "--cov-report=html",
   "--cov-report=xml",
   "--cov-fail-under=80",
+  "--import-mode=importlib",
 ]
 testpaths = ["tests"]
 python_files = ["test_*.py", "*_test.py"]
diff --git a/src/codeweaver/_version.py b/src/codeweaver/_version.py
@@ -4,6 +4,6 @@
 from typing import Final
 
 
-__version__: Final[str] = "0.0.1rc295+gfc4f90a"
+__version__: Final[str] = "0.0.1rc3+g76d9888"
 
 __all__ = ("__version__",)
diff --git a/tests/benchmark/chunker/test_performance.py b/tests/benchmark/chunker/test_performance.py
@@ -23,6 +23,9 @@
 from codeweaver.engine.chunker.selector import ChunkerSelector
 from codeweaver.providers.embedding.capabilities.base import EmbeddingModelCapabilities
 
+pytestmark = [pytest.mark.benchmark, pytest.mark.performance, pytest.mark.slow]
+
+
 
 # Test data generators
 def generate_python_file(num_lines: int) -> str:
diff --git a/tests/contract/test_memory_provider.py b/tests/contract/test_memory_provider.py
@@ -20,10 +20,10 @@
 from codeweaver.core.spans import Span
 from codeweaver.providers.vector_stores.inmemory import MemoryVectorStore
 
-
 pytestmark = pytest.mark.unit
 
 
+
 @pytest.fixture
 def temp_persist_path():
     """Provide temporary persistence path for testing."""
diff --git a/tests/contract/test_qdrant_provider.py b/tests/contract/test_qdrant_provider.py
@@ -21,11 +21,12 @@
 from codeweaver.core.spans import Span
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
-# Mark all tests in this module as requiring Qdrant
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
 
+
+# Mark all tests in this module as requiring Qdrant
+
 @pytest.fixture
 async def qdrant_config():
     """Provide test Qdrant configuration."""
diff --git a/tests/contract/test_vector_store_provider.py b/tests/contract/test_vector_store_provider.py
@@ -16,6 +16,7 @@
 
 from codeweaver.providers.vector_stores.base import VectorStoreProvider
 
+pytestmark = [pytest.mark.unit, pytest.mark.validation]
 
 class TestVectorStoreProviderContract:
     """Test VectorStoreProvider abstract interface contract compliance."""
diff --git a/tests/integration/chunker/test_e2e.py b/tests/integration/chunker/test_e2e.py
@@ -14,6 +14,9 @@
 
 from codeweaver.engine.chunker.selector import ChunkerSelector
 
+pytestmark = [pytest.mark.integration]
+
+
 
 @pytest.fixture
 def mock_governor():
@@ -263,6 +266,9 @@ def test_e2e_parallel_dict_convenience():
     from codeweaver.engine.chunker.parallel import chunk_files_parallel_dict
     from codeweaver.providers.embedding.capabilities.base import EmbeddingModelCapabilities
 
+
+
+
     # Get sample files
     fixture_dir = Path("tests/fixtures")
     files = []
diff --git a/tests/integration/test_custom_config.py b/tests/integration/test_custom_config.py
@@ -13,10 +13,13 @@
 
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
 
+
+
+
+
 async def test_custom_configuration():
     """
     User Story: Customize provider settings like collection names.
diff --git a/tests/integration/test_hybrid_ranking.py b/tests/integration/test_hybrid_ranking.py
@@ -17,10 +17,13 @@
 from codeweaver.core.language import SemanticSearchLanguage as Language
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
 
+
+
+
+
 async def test_hybrid_search_ranking():
     """
     User Story: Hybrid search combines sparse and dense for better relevance.
diff --git a/tests/integration/test_hybrid_storage.py b/tests/integration/test_hybrid_storage.py
@@ -17,10 +17,13 @@
 from codeweaver.core.language import SemanticSearchLanguage as Language
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
 
+
+
+
+
 @pytest.fixture
 async def qdrant_provider():
     """Create Qdrant provider for testing."""
diff --git a/tests/integration/test_incremental_updates.py b/tests/integration/test_incremental_updates.py
@@ -17,10 +17,13 @@
 from codeweaver.core.language import SemanticSearchLanguage as Language
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
 
+
+
+
+
 async def test_incremental_updates():
     """
     User Story: File updates only re-index changed chunks.
diff --git a/tests/integration/test_memory_persistence.py b/tests/integration/test_memory_persistence.py
@@ -19,10 +19,13 @@
 from codeweaver.core.language import SemanticSearchLanguage as Language
 from codeweaver.providers.vector_stores.inmemory import MemoryVectorStore
 
-
 pytestmark = pytest.mark.integration
 
 
+
+
+
+
 async def test_inmemory_persistence():
     """
     User Story: Use in-memory storage with automatic persistence.
diff --git a/tests/integration/test_partial_embeddings.py b/tests/integration/test_partial_embeddings.py
@@ -17,10 +17,13 @@
 from codeweaver.core.language import SemanticSearchLanguage as Language
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
 
+
+
+
+
 async def test_partial_embeddings():
     """
     User Story: Handle cases where dense embedding generation fails.
diff --git a/tests/integration/test_persistence.py b/tests/integration/test_persistence.py
@@ -17,10 +17,13 @@
 from codeweaver.core.language import SemanticSearchLanguage as Language
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
 
+
+
+
+
 async def test_persistence_across_restarts():
     """
     User Story: Previously indexed data persists across restarts.
diff --git a/tests/integration/test_provider_switch.py b/tests/integration/test_provider_switch.py
@@ -19,10 +19,8 @@
 from codeweaver.providers.vector_stores.inmemory import MemoryVectorStore
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
-
 pytestmark = [pytest.mark.integration, pytest.mark.external_api]
 
-
 async def test_provider_switch_detection():
     """
     User Story: Warn when switching providers to prevent data loss.
diff --git a/tests/performance/test_vector_store_performance.py b/tests/performance/test_vector_store_performance.py
@@ -34,6 +34,12 @@
 from codeweaver.providers.vector_stores.inmemory import MemoryVectorStore
 from codeweaver.providers.vector_stores.qdrant import QdrantVectorStore
 
+pytestmark = [pytest.mark.async_test, pytest.mark.performance, pytest.mark.slow]
+
+
+
+
+
 
 # Test data generation helpers
 def create_test_chunk(
diff --git a/tests/test_delimiters.py b/tests/test_delimiters.py
@@ -36,6 +36,8 @@
     matches_pattern,
 )
 
+pytestmark = [pytest.mark.unit]
+
 
 class TestDelimiterPattern:
     """Test DelimiterPattern DSL and expansion."""
diff --git a/tests/test_lazy_importer.py b/tests/test_lazy_importer.py
@@ -13,6 +13,8 @@
 
 from codeweaver.common.utils.lazy_importer import LazyImport, lazy_import
 
+pytestmark = [pytest.mark.unit]
+
 
 class TestLazyImportBasics:
     """Test basic LazyImport functionality."""
diff --git a/tests/unit/engine/chunker/test_delimiter_basic.py b/tests/unit/engine/chunker/test_delimiter_basic.py
@@ -25,6 +25,9 @@
 from codeweaver.engine.chunker.delimiter import DelimiterChunker
 from codeweaver.engine.chunker.delimiters.kind import DelimiterKind
 
+pytestmark = [pytest.mark.unit]
+
+
 
 @pytest.fixture
 def governor() -> ChunkGovernor:
diff --git a/tests/unit/engine/chunker/test_delimiter_edge_cases.py b/tests/unit/engine/chunker/test_delimiter_edge_cases.py
@@ -19,6 +19,9 @@
 from codeweaver.engine.chunker.base import ChunkGovernor
 from codeweaver.engine.chunker.delimiter import DelimiterChunker
 
+pytestmark = [pytest.mark.unit]
+
+
 
 @pytest.fixture
 def delimiter_chunker(chunk_governor: ChunkGovernor) -> DelimiterChunker:
@@ -337,7 +340,6 @@ def test_unmatched_delimiters(
 
         # Create DiscoveredFile - should not crash, should produce some chunks
         from codeweaver.core.discovery import DiscoveredFile
-
         discovered_file = DiscoveredFile.from_path(file_path)
         chunks = delimiter_chunker.chunk(content, file=discovered_file)
 
diff --git a/tests/unit/engine/chunker/test_governance.py b/tests/unit/engine/chunker/test_governance.py
@@ -16,6 +16,8 @@
 from codeweaver.engine.chunker.exceptions import ChunkingTimeoutError, ChunkLimitExceededError
 from codeweaver.engine.chunker.governance import ResourceGovernor
 
+pytestmark = [pytest.mark.unit]
+
 
 class PerformanceSettings(Protocol):
     """Minimal protocol for testing."""
diff --git a/tests/unit/engine/chunker/test_selector.py b/tests/unit/engine/chunker/test_selector.py
@@ -7,11 +7,15 @@
 from pathlib import Path
 from unittest.mock import Mock
 
+import pytest
+
 from codeweaver.engine.chunker.base import ChunkGovernor
 from codeweaver.engine.chunker.delimiter import DelimiterChunker
 from codeweaver.engine.chunker.selector import ChunkerSelector
 from codeweaver.engine.chunker.semantic import SemanticChunker
 
+pytestmark = [pytest.mark.unit]
+
 
 def test_selector_chooses_semantic_for_python(chunk_governor: ChunkGovernor) -> None:
     """Verify selector picks semantic for supported language."""
diff --git a/tests/unit/engine/chunker/test_semantic_basic.py b/tests/unit/engine/chunker/test_semantic_basic.py
@@ -11,12 +11,14 @@
 Python, JavaScript, and Rust.
 """
 
-
+import pytest
 
 from codeweaver.core.language import SemanticSearchLanguage
 from codeweaver.engine.chunker import SemanticChunker
 from codeweaver.engine.chunker.base import ChunkGovernor
 
+pytestmark = [pytest.mark.unit]
+
 
 def test_semantic_chunks_python_file(
     chunk_governor: ChunkGovernor, discovered_sample_python_file
diff --git a/tests/unit/engine/chunker/test_semantic_dedup.py b/tests/unit/engine/chunker/test_semantic_dedup.py
@@ -20,6 +20,9 @@
 from codeweaver.engine.chunker.base import ChunkGovernor
 from codeweaver.engine.chunker.semantic import SemanticChunker
 
+pytestmark = [pytest.mark.unit]
+
+
 
 @pytest.fixture
 def chunk_governor() -> ChunkGovernor:
@@ -257,6 +260,7 @@ def test_batch_id_tracking(
     # Create DiscoveredFile and chunk the file
     from codeweaver.core.discovery import DiscoveredFile
 
+
     discovered_file = DiscoveredFile.from_path(python_file_with_unique_functions)
     chunks = semantic_chunker.chunk(content, file=discovered_file)
 
diff --git a/tests/unit/engine/chunker/test_semantic_edge_cases.py b/tests/unit/engine/chunker/test_semantic_edge_cases.py
@@ -12,6 +12,8 @@
 from codeweaver.engine.chunker.base import ChunkGovernor
 from codeweaver.engine.chunker.exceptions import BinaryFileError
 
+pytestmark = [pytest.mark.unit]
+
 
 def test_empty_file(chunk_governor: ChunkGovernor, discovered_empty_file) -> None:
     """Verify empty file returns empty list."""
diff --git a/tests/unit/engine/chunker/test_semantic_errors.py b/tests/unit/engine/chunker/test_semantic_errors.py
@@ -33,6 +33,9 @@
 if TYPE_CHECKING:
     from pytest import MonkeyPatch
 
+pytestmark = [pytest.mark.unit]
+
+
 # Path to test fixtures directory
 FIXTURES_DIR = Path(__file__).parent.parent.parent.parent / "fixtures"
 
diff --git a/tests/unit/engine/chunker/test_semantic_oversized.py b/tests/unit/engine/chunker/test_semantic_oversized.py
@@ -22,6 +22,8 @@
 from codeweaver.engine.chunker.base import ChunkGovernor
 from codeweaver.engine.chunker.semantic import SemanticChunker
 
+pytestmark = [pytest.mark.unit]
+
 
 @pytest.fixture
 def python_chunker(chunk_governor: ChunkGovernor) -> SemanticChunker:

Original file line number	Diff line number	Diff line change
`@@ -566,6 +566,7 @@ addopts = [`
`566`	`566`	`"--cov-report=html",`
`567`	`567`	`"--cov-report=xml",`
`568`	`568`	`"--cov-fail-under=80",`
	`569`	`+ "--import-mode=importlib",`
`569`	`570`	`]`
`570`	`571`	`testpaths = ["tests"]`
`571`	`572`	`python_files = ["test_.py", "_test.py"]`