griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #146143: MacOS UI Test failures with multiple windows

Browse Source 
This commit bumps up the time delay while running these tests from
1/60th of a second to 1/6th of a second to ensure that the new window
is created prior to the rest of the test running while.

Pull Request: https://projects.blender.org/blender/blender/pulls/146309
This commit is contained in:
Sean Kim
2025-09-23 15:56:15 +02:00
committed by Sean Kim
parent 356276927f
commit 289d812712
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/python/ui_simulate/test_undo.py
View File

@@ -12,10 +12,21 @@ import datetime
# are handled. This isn't great but seems not to be a problem for users?
_MENU_CONFIRM_HACK = True
# FIXME: When running multi window tests, the view layer in the new window
# may not be updated after a single event loop. This fixed delay is to allow
# the corresponding tests to run as expected. See: #136012.
_MENU_CONFIRM_HACK_MULTI_WINDOW_PAUSE_SECONDS = 1 / 60
# WARNING: macOS requires extra delay (it's unclear why), see: #146143.
import sys
if sys.platform == "darwin":
_MENU_CONFIRM_HACK_MULTI_WINDOW_PAUSE_SECONDS = 1 / 6
del sys
# -----------------------------------------------------------------------------
# Utilities
def _keep_open():
"""
Only for development, handy so we can quickly keep the window open while testing.
@@ -786,7 +797,7 @@ def view3d_multi_mode_multi_window():
yield e_b.ret()
if _MENU_CONFIRM_HACK:
# We wait for a brief period of time after confirming to ensure that each main window has a different view layer
yield datetime.timedelta(seconds=1 / 60)
yield datetime.timedelta(seconds=_MENU_CONFIRM_HACK_MULTI_WINDOW_PAUSE_SECONDS)
t.assertNotEqual(window_a.view_layer, window_b.view_layer, "Windows should have different view layers")
@@ -945,7 +956,7 @@ def view3d_edit_mode_multi_window():
yield e_b.ret()
if _MENU_CONFIRM_HACK:
# We wait for a brief period of time after confirming to ensure that each main window has a different view layer
yield datetime.timedelta(seconds=1 / 60)
yield datetime.timedelta(seconds=_MENU_CONFIRM_HACK_MULTI_WINDOW_PAUSE_SECONDS)
t.assertNotEqual(window_a.view_layer, window_b.view_layer, "Windows should have different view layers")