Skip to content

CHANGE: Increase timeouts in UI tests CI instabilities #2198

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 14, 2025
Merged

CHANGE: Increase timeouts in UI tests CI instabilities #2198

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bc88b3e
Increase WaitForAction timeout tests to 10 seconds
jfreire-unity Jun 27, 2025
fce3fbc
Increase even more the timeout
jfreire-unity Jul 1, 2025
e3542de
Ignore unstable tests
jfreire-unity Jul 3, 2025
099e53a
Do another attempt to increase timeout in WaitForNotDirty
jfreire-unity Jul 3, 2025
70b5949
Pass timeout to WaitForFocus as well
jfreire-unity Jul 7, 2025
9254b47
Add const variable for timeout
jfreire-unity Jul 7, 2025
e482d94
Change const timeout to double
jfreire-unity Jul 7, 2025
bfaf110
Increase timeout in UIToolKitBaseTestWindow instead
jfreire-unity Jul 7, 2025
9b0e617
Update Assets/Tests/InputSystem.Editor/UIToolkitBaseTestWindow.cs
jfreire-unity Jul 8, 2025
82e180f
Merge branch 'develop' into ci-ui-tests-increase-timeout-to-10-secs
jfreire-unity Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public override IEnumerator UnitySetup()

#region Helper methods

IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs = 5.0)
IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs = kDefaultTimeoutSecs)
{
return WaitUntil(() =>
{
Expand All @@ -58,7 +58,7 @@ IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs
}, $"WaitForActionMapRename {index} {isActive}", timeoutSecs);
}

IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 5.0)
IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = kDefaultTimeoutSecs)
{
return WaitUntil(() =>
{
Expand Down Expand Up @@ -208,10 +208,8 @@ public IEnumerator CanRenameAction()
// Re-fetch the actions since the UI may have refreshed.
actionItem = actionContainer.Query<InputActionsTreeViewItem>().ToList();

// Click twice to start the rename
SimulateClickOn(actionItem[1]);
yield return WaitForNotDirty();

// If the item is already focused, don't click again
if (!actionItem[1].IsFocused)
{
Expand Down
9 changes: 5 additions & 4 deletions Assets/Tests/InputSystem.Editor/UIToolkitBaseTestWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
public class UIToolkitBaseTestWindow<T> where T : EditorWindow
{
protected T m_Window;
protected const double kDefaultTimeoutSecs = 10.0f;

#region setup and teardown
[OneTimeSetUp]
Expand Down Expand Up @@ -124,7 +125,7 @@ protected void SimulateDeleteCommand()
/// Wait for UI toolkit scheduler to process the frame
/// </summary>
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
protected IEnumerator WaitForSchedulerLoop(double timeoutSecs = 5.0)
protected IEnumerator WaitForSchedulerLoop(double timeoutSecs = kDefaultTimeoutSecs)
{
bool done = false;
m_Window.rootVisualElement.schedule.Execute(() => done = true);
Expand All @@ -136,7 +137,7 @@ protected IEnumerator WaitForSchedulerLoop(double timeoutSecs = 5.0)
/// </summary>
/// <param name="ve">VisualElement to be focused</param>
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
protected IEnumerator WaitForFocus(VisualElement ve, double timeoutSecs = 5.0)
protected IEnumerator WaitForFocus(VisualElement ve, double timeoutSecs = kDefaultTimeoutSecs)
{
return WaitUntil(() => ve.focusController.focusedElement == ve, "WaitForFocus", timeoutSecs);
}
Expand All @@ -145,7 +146,7 @@ protected IEnumerator WaitForFocus(VisualElement ve, double timeoutSecs = 5.0)
/// Wait for the windows to be not dirty
/// </summary>
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
protected IEnumerator WaitForNotDirty(double timeoutSecs = 5.0)
protected IEnumerator WaitForNotDirty(double timeoutSecs = kDefaultTimeoutSecs)
{
return WaitUntil(() => m_Window.rootVisualElement.panel.isDirty == false, "WaitForNotDirty", timeoutSecs);
}
Expand All @@ -156,7 +157,7 @@ protected IEnumerator WaitForNotDirty(double timeoutSecs = 5.0)
/// <param name="action">Lambda to call between frame</param>
/// <param name="assertMessage">Assert Message</param>
/// <param name="timeoutSecs">Maximum time to wait in seconds.</param>
protected IEnumerator WaitUntil(Func<bool> action, string assertMessage, double timeoutSecs = 5.0)
protected IEnumerator WaitUntil(Func<bool> action, string assertMessage, double timeoutSecs = kDefaultTimeoutSecs)
{
var endTime = EditorApplication.timeSinceStartup + timeoutSecs;
do
Expand Down