testcheck: sort inline assertions #15290
Merged
Conversation
This file contains 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
ikonst
force-pushed
the
sort-inline-assertions
branch
from
c77b794 to
a3e91a3
Compare
|
@JelleZijlstra Let me know if it makes sense. I tried to avoid impacting performance by only doing it for the part of (Also, doing it broadly for entire |
mypy/test/testcheck.py
Outdated
| @@ -163,21 +176,20 @@ def run_case_once( | |||
| a = normalize_error_messages(a) | |||
|
|
|||
| # Make sure error messages match | |||
| if incremental_step == 0: | |||
| if incremental_step < 2: | |||
| # Not incremental | |||
There was a problem hiding this comment.
This comment seems outdated
| if incremental_step == 1: | ||
| msg = "Unexpected type checker output in incremental, run 1 ({}, line {})" | ||
| else: | ||
| msg = "Unexpected type checker output ({}, line {})" |
There was a problem hiding this comment.
Maybe add assert incremental_step == 0
mypy/test/data.py
Outdated
| @@ -67,6 +67,7 @@ def parse_test_case(case: DataDrivenTestCase) -> None: | |||
| files: list[tuple[str, str]] = [] # path and contents | |||
| output_files: list[tuple[str, str | Pattern[str]]] = [] # output path and contents | |||
| output: list[str] = [] # Regular output errors | |||
| output_inline_start: int # Start index of output inline assertions | |||
There was a problem hiding this comment.
Don't think you need to declare this up front. The other variables are declared here so we can say what should be in the list/dict.
JelleZijlstra
approved these changes
May 24, 2023
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.
The order in which inline error assertions are collected into the
TestCase.output(the "expected") can differ from the actual errors' order. Specifically, it's the order of the files themselves (as they're traversed during build), rather than individual lines.To allow inline assertions across multiple modules, we can sort the collected errors to match the actual errors (only when it concerns module order; within the modules the order remains stable).