Repository navigation
Conversation
the-glu
commented
Oct 27, 2026
|
|
||
| self.begin_test_step("Activate Flight 2") | ||
| flight2_activated = self.resolve_flight(self.equal_prio_flight2_activated) | ||
| if activate_flight2: |
Member
Author
There was a problem hiding this comment.
Note to reviewers: the diff is strange but that only a tabulated block for the if.
| ## Attempt to plan flight into conflict test case | ||
|
|
||
| ## Attempt to plan flight into conflict with planned flight test case | ||
|  |
Member
There was a problem hiding this comment.
All of the subtle distinctions between different cases/steps are hard to keep track of or understand, so I think the accuracy of the pictures is very important. The convention for the pictures is that a planned/Accepted flight is colored gray while an Activated flight is colored green. So, most of the pictures in the additions of this PR should be new ones with Flight 2 as gray.
This branch has not been deployed
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
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.
This PR fixes #1836 by running 'conflict_equal_priority' tests with a planned flight.
This is mostly a copy-paste of existing tests and descriptions of the part with an activated flight, with slightly changed wording.
Tested with a special mock-uss that ignores planned flights for conflicts and works as expected.