Fix thread deadlock during TestExecutor teardown when test_state is None. - #1311
Merged
Conversation
copybara-service
Bot
force-pushed
the
test_953449774
branch
from
July 27, 2026 18:02
24a8e9f to
e345884
Compare
…one. When TestState fails during initialization (e.g. InvalidPlugError for unsubstituted placeholders), self.test_state remains None. During thread teardown in the finally block, accessing self.running_test_state raised a secondary TestStopError, which prevented self._execution_finished.set() from being called and caused test.execute() to hang indefinitely until test timeout. This change guards against None test_state in teardown and close(), and wraps teardown in a try/finally block so _execution_finished.set() is always signaled. PiperOrigin-RevId: 954728594
copybara-service
Bot
force-pushed
the
test_953449774
branch
from
July 27, 2026 18:14
e345884 to
471011e
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix thread deadlock during TestExecutor teardown when test_state is None.
When TestState fails during initialization (e.g. InvalidPlugError for unsubstituted placeholders), self.test_state remains None. During thread teardown in the finally block, accessing self.running_test_state raised a secondary TestStopError, which prevented self._execution_finished.set() from being called and caused test.execute() to hang indefinitely until test timeout.
This change guards against None test_state in teardown and close(), and wraps teardown in a try/finally block so _execution_finished.set() is always signaled.