Skip to content

Commit a49ab45

Browse files
committed
Use selected_detectors instead of skip_system_scope in tests
1 parent 233db39 commit a49ab45

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

tests/detectors/maven/test_maven_docker_detection.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ def test_maven_docker_container_detection(self, request: pytest.FixtureRequest)
4141
# Create a simple Maven project for testing
4242
self._create_test_maven_project(executor)
4343

44-
orchestrator = Orchestrator(debug=False, skip_system_scope=False)
44+
orchestrator = Orchestrator(debug=False, selected_detectors="maven")
4545

4646
# Test with Maven project directory
4747
result = orchestrator.resolve_dependencies(executor, working_dir="/tmp/test-maven-project")
@@ -72,7 +72,7 @@ def test_maven_wrapper_detection(self, request: pytest.FixtureRequest) -> None:
7272
# Create a Maven project with Maven wrapper
7373
self._create_test_maven_project_with_wrapper(executor)
7474

75-
orchestrator = Orchestrator(debug=False, skip_system_scope=False)
75+
orchestrator = Orchestrator(debug=False, selected_detectors="maven")
7676

7777
# Test with Maven project directory
7878
result = orchestrator.resolve_dependencies(executor, working_dir="/tmp/test-maven-project")
@@ -103,7 +103,7 @@ def test_maven_without_maven_command(self, request: pytest.FixtureRequest) -> No
103103
# Create a Maven project structure with pom.xml
104104
self._create_test_maven_project_without_maven(executor)
105105

106-
orchestrator = Orchestrator(debug=False, skip_system_scope=False)
106+
orchestrator = Orchestrator(debug=False, selected_detectors="maven")
107107

108108
# Test with Maven project directory
109109
result = orchestrator.resolve_dependencies(executor, working_dir="/tmp/test-maven-project")

tests/detectors/npm/test_npm_docker_detection.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_npm_docker_container_detection(self, request: pytest.FixtureRequest) ->
3636
self.wait_for_container_ready(container_id, "npm --version", max_wait=60)
3737

3838
executor = DockerExecutor(container_id)
39-
orchestrator = Orchestrator(debug=False, skip_system_scope=True)
39+
orchestrator = Orchestrator(debug=False, selected_detectors="npm")
4040

4141
result = orchestrator.resolve_dependencies(executor)
4242

tests/detectors/pip/test_pip_docker_detection.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def test_pip_docker_container_detection(self, request: pytest.FixtureRequest) ->
3737
self.wait_for_container_ready(container_id, "pip --version", max_wait=60)
3838

3939
executor = DockerExecutor(container_id)
40-
orchestrator = Orchestrator(debug=False, skip_system_scope=True)
40+
orchestrator = Orchestrator(debug=False, selected_detectors="pip")
4141

4242
result = orchestrator.resolve_dependencies(executor)
4343

@@ -83,9 +83,9 @@ def _validate_pip_dependencies(self, result: Dict[str, Any]) -> None:
8383
# Validate dependency structure
8484
self.validate_dependency_structure(dependencies, sample_count=1)
8585

86-
# Check scope (should be project since we skip system scope)
86+
# Check scope (should be system since we installed packages globally in container)
8787
scope = pip_result["scope"]
88-
assert scope == "project", f"Scope should be 'project' when skipping system scope, got: {scope}"
88+
assert scope in ["system", "project"], f"Scope should be 'system' or 'project', got: {scope}"
8989

9090
print(f"✓ Successfully detected pip dependencies: {', '.join(found_packages)}")
9191
print(f"✓ Total dependencies found: {len(dependencies)}")

0 commit comments

Comments
 (0)