[uss_qualifier] Fix flight cleanup #1182
Merged
Conversation
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
barroco
approved these changes
Sep 29, 2025
| log(notes) | ||
| return unsuccessful(notes), 500 | ||
| # Activity result is Failed, but we executed the activity successfully | ||
| return unsuccessful(notes), 200 |
Contributor
There was a problem hiding this comment.
The changes in this file may be good candidates for a note in the NEXT_RELEASE_NOTE.
Member
Author
There was a problem hiding this comment.
I think the change to 500 from 200 was relatively recent and this just fixes a bug rather than changing an intended behavior
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Currently, the flight_planning client keeps track of planned flights which need to be cleaned up, but then those planned flights are sometimes not removed from the set of flights to be cleaned up so there is unnecessary cleanup. This PR fixes this issue, and also fixes the response codes from mock_uss when deleting a flight to clean it up.
Since
cleanup_flightswas not really adding any value and merely added a level of indirection totry_end_flightand generating an unnecessary duplicate of the PlanningActivityError, it is removed and replaced with direct calls totry_end_flight.