Skip to content

Commit 0d5853a

Browse files
committed
Re-add accidental deletion of comment and expand a bit
1 parent 730f717 commit 0d5853a

File tree

1 file changed

+2
-0
lines changed
  • opentelemetry-instrumentation/tests/auto_instrumentation

1 file changed

+2
-0
lines changed

opentelemetry-instrumentation/tests/auto_instrumentation/test_load.py

+2
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,8 @@ def test_load_instrumentors_dep_conflict(self, iter_mock, mock_logger): # pylin
307307
DependencyConflictError(dependency_conflict),
308308
]
309309

310+
# If a dependency conflict is raised, that instrumentation should not be loaded, but others still should.
311+
# In this case, ep_mock4 will fail to load and ep_mock2 will succeed. (ep_mock1 and ep_mock3 are disabled)
310312
iter_mock.return_value = (ep_mock1, ep_mock2, ep_mock3, ep_mock4)
311313
_load._load_instrumentors(distro_mock)
312314
distro_mock.load_instrumentor.assert_has_calls(

0 commit comments

Comments
 (0)