Fix CI test failure: TestFruitColourFallback in catch ruleset - #341
Merged
Conversation
…fication Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/4b89ea94-0ef4-4f3a-9dd7-ffb7cd4e8d09 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
winnerspiros
May 19, 2026 14:04
View session
|
|
Owner
|
@copilot check ci errors and warnings and fix |
…rison Agent-Logs-Url: https://github.com/winnerspiros/osu/sessions/f3fc7ab7-91f5-4585-85c4-d37cdef778b8 Co-authored-by: winnerspiros <1675249+winnerspiros@users.noreply.github.com>
Author
Checked CI logs for run 26102450367. Two failures found:
|
Copilot
AI
changed the title
Fix three CI build errors introduced in previous PRs
Fix CI test failure: TestFruitColourFallback in catch ruleset
May 19, 2026
winnerspiros
approved these changes
May 19, 2026
There was a problem hiding this comment.
Pull request overview
This PR fixes a flaky catch ruleset test around hyper-dash fruit colouring and includes small cleanup/migration adjustments elsewhere.
Changes:
- Retries the hyper-dash fruit colour assertion until async drawable loading completes.
- Compares sprite colour via explicit SRGB access.
- Removes an unused matchmaking field and simplifies a nullable colour assignment.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
osu.Game.Rulesets.Catch.Tests/TestSceneHyperDashColouring.cs |
Updates the fruit colour test to wait for the expected colour and compare via TopLeft.SRGB. |
osu.Game.Rulesets.Osu/Edit/OsuSliderVelocityToolboxGroup.cs |
Replaces osuTK with System.Numerics for vector usage. |
osu.Game/Screens/Edit/Components/FormSampleSet.cs |
Simplifies null-checked triangle colour assignment. |
osu.Game/Screens/OnlinePlay/Matchmaking/Queue/ScreenQueue.cs |
Removes an unused historyInsertOrder field. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| using osu.Game.Rulesets.Osu.Objects; | ||
| using osu.Game.Screens.Edit; | ||
| using osuTK; | ||
| using System.Numerics; |
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.
Fixes the consistently-failing
TestFruitColourFallbacktest inTestSceneHyperDashColouring.Changes Made
AddAssert→AddUntilStepfor the hyper-dash fruit colour check, consistent with how the catcher colour check works. This ensures the assertion retries until async drawable loading (via[BackgroundDependencyLoader]) andLegacyCatchHitObjectPiece.LoadCompletehave completed.c.Colour == expectedColourtoc.Colour.TopLeft.SRGB == expectedColour. This uses direct SRGB field access instead of relying on the implicitColourInfo → SRGBColour → Colour4conversion chain (which internally assertsHasSingleColour = true), making the comparison more robust and consistent with the pattern used elsewhere in the codebase.Notes
DetectSdkLocationsMSBuild task, Xcode version mismatch) is a CI infrastructure issue and is not fixable in code.