ESQL: Fix skipping of generative ESQL tests #132390
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
alex-spies added >test 
elasticsearchmachine added the Team:Analytics 
| Pinging @elastic/es-analytical-engine (Team:Analytics) |
The error message can sometimes be split into multiple lines with backslashes marking the line boundaries. Let's make our skips work even in case of overlong lines.
alex-spies force-pushed the fix-gen-test-skipping branch from d052ccb to ab2b331 Compare 
idegtiarenko approved these changes Aug 4, 2025
fang-xing-esql approved these changes Aug 4, 2025
💔 Backport failed
You can use sqren/backport to manually backport by running |
alex-spies added a commit to alex-spies/elasticsearch that referenced this pull request Aug 5, 2025
The error message can sometimes be split into multiple lines with backslashes marking the line boundaries. Let's make our skips work even in case of overlong lines. (cherry picked from commit ccfbf49) # Conflicts: # muted-tests.yml
💔 Some backports could not be created
Manual backportTo create the backport manually run: Questions ?Please refer to the Backport tool documentation |
| The generative tests on 9.1 are ahead of those on 8.19. Won't backport to 8.19 as this would create a mess. |
elasticsearchmachine pushed a commit that referenced this pull request Aug 5, 2025
szybia added a commit to szybia/elasticsearch that referenced this pull request Aug 5, 2025
…cking * upstream/main: (26 commits) [Fleet] add privileges to `kibana_system` to read integrations data (elastic#132400) Add `TestEntitlementsRule` with support for dynamic entitled node paths for testing (elastic#132077) Reduce logging frequency for GCS per project clients (elastic#132429) Skip update/100_synthetic_source tests in yamlRestCompatTests (elastic#132296) Correct exception for missing nested path (elastic#132408) Fixing esql release tests elastic#132369 (elastic#132406) Adjust date docvalue formatting to return 4xx instead of 5xx (elastic#132414) Handle nested fields with the termvectors REST API in artificial docs (elastic#92568) Only collect bulk scored vectors when exceeding min competitive (elastic#132293) Fix release tests diskbbq update (elastic#132405) ESQL: Fix skipping of generative tests (elastic#132390) Short circuit failure handling in OIDC flow (elastic#130618) Small optimization in OptimizedScalarQuantizer by using mul instead of div (elastic#132397) Aggs: Add validation to Bucket script pipeline agg (elastic#132320) ESQL: Multiple parameters in ungrouped aggs (elastic#132375) ESQL: Explain test operators (elastic#132374) EQL: Deal with internally created IN in a different way for EQL (elastic#132167) Speed up hierarchical k-means by computing distances in bulk (elastic#132384) Reduce the number of fields per document (elastic#132322) Assert current thread in ESQL (elastic#132324) ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 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.
Fix #132273
Our generative tests skip some faulty queries based on the returned error message.
The error message can sometimes be split into multiple lines with backslashes marking the line boundaries, like in the following example:
This should have been skipped based on the string
optimized incorrectly due to missing references, but this skip was prevented because this string was split across multiple lines.Let's stitch the error message back together before we check if it should be ignored, so that such line splits don't prevent skips.