Skip to content

Commit c7ad62f

Browse files
committed
Do another attempt to increase timeout in WaitForNotDirty
1 parent 4c23424 commit c7ad62f

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Assets/Tests/InputSystem.Editor/InputActionsEditorTests.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override IEnumerator UnitySetup()
4545

4646
#region Helper methods
4747

48-
IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs = 5.0)
48+
IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs = 10.0)
4949
{
5050
return WaitUntil(() =>
5151
{
@@ -58,7 +58,7 @@ IEnumerator WaitForActionMapRename(int index, bool isActive, double timeoutSecs
5858
}, $"WaitForActionMapRename {index} {isActive}", timeoutSecs);
5959
}
6060

61-
IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 5.0)
61+
IEnumerator WaitForActionRename(int index, bool isActive, double timeoutSecs = 10.0)
6262
{
6363
return WaitUntil(() =>
6464
{
@@ -87,7 +87,6 @@ public void CanListActionMaps()
8787
}
8888

8989
[UnityTest]
90-
[Ignore("Instability, see ISXB-1284")]
9190
public IEnumerator CanCreateActionMap()
9291
{
9392
var button = m_Window.rootVisualElement.Q<Button>("add-new-action-map-button");
@@ -116,7 +115,6 @@ public IEnumerator CanCreateActionMap()
116115
}
117116

118117
[UnityTest]
119-
[Ignore("Instability, see ISXB-1284")]
120118
public IEnumerator CanRenameActionMap()
121119
{
122120
var actionMapsContainer = m_Window.rootVisualElement.Q("action-maps-container");
@@ -128,9 +126,10 @@ public IEnumerator CanRenameActionMap()
128126
m_Window.rootVisualElement.Q<ListView>("action-maps-list-view").selectedIndex = 1;
129127

130128
// changing the selection triggers a state change, wait for the scheduler to process the frame
129+
var timeoutSecs = 10.0;
131130
yield return WaitForSchedulerLoop();
132-
yield return WaitForNotDirty();
133-
yield return WaitForFocus(m_Window.rootVisualElement.Q("action-maps-list-view"));
131+
yield return WaitForNotDirty(timeoutSecs);
132+
yield return WaitForFocus(m_Window.rootVisualElement.Q("action-maps-list-view"), timeoutSecs);
134133

135134
// refetch the action map item since the ui may have refreshed.
136135
actionMapItem = actionMapsContainer.Query<InputActionMapsTreeViewItem>().ToList();
@@ -203,16 +202,17 @@ public IEnumerator CanRenameAction()
203202
m_Window.rootVisualElement.Q<TreeView>("actions-tree-view").selectedIndex = 1;
204203

205204
// Selection change triggers a state change, wait for the scheduler to process the frame
205+
var timeoutSecs = 10.0;
206206
yield return WaitForSchedulerLoop();
207-
yield return WaitForNotDirty();
207+
yield return WaitForNotDirty(timeoutSecs);
208208
yield return WaitForFocus(m_Window.rootVisualElement.Q<TreeView>("actions-tree-view"));
209209

210210
// Re-fetch the actions since the UI may have refreshed.
211211
actionItem = actionContainer.Query<InputActionsTreeViewItem>().ToList();
212212

213213
// Click twice to start the rename
214214
SimulateClickOn(actionItem[1]);
215-
yield return WaitForNotDirty();
215+
yield return WaitForNotDirty(timeoutSecs);
216216

217217
// If the item is already focused, don't click again
218218
if (!actionItem[1].IsFocused)

0 commit comments

Comments
 (0)