Skip to content

Detect wayland video driver, and mark 2 tests as expected failures on wayland #284

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 3 commits into from
Apr 2, 2025
Merged

Detect wayland video driver, and mark 2 tests as expected failures on wayland #284

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20b1ed0
Detect wayland video driver
madebr Apr 1, 2025
8315d15
Wayland does generally not allow changing the window icon
madebr Apr 1, 2025
f95505e
Wayland does not allow repositioning of windows
madebr Apr 1, 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
5 changes: 4 additions & 1 deletion sdl2/test/video_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@

# Some tests don't work properly with some video drivers, so check the name
DRIVER_DUMMY = False
DRIVER_WAYLAND = False
DRIVER_X11 = False
try:
sdl2.SDL_Init(sdl2.SDL_INIT_VIDEO)
driver_name = sdl2.SDL_GetCurrentVideoDriver()
sdl2.SDL_Quit()
DRIVER_DUMMY = driver_name == b"dummy"
DRIVER_WAYLAND = driver_name == b"wayland"
DRIVER_X11 = driver_name == b"x11"
except:
pass
Expand Down Expand Up @@ -438,6 +440,7 @@ def test_SDL_GetSetWindowTitle(window):
sdl2.SDL_SetWindowTitle(window, b"Hello there")
assert sdl2.SDL_GetWindowTitle(window) == b"Hello there"

@pytest.mark.xfail(DRIVER_WAYLAND, reason="wayland does not allow changing the window icon")
def test_SDL_SetWindowIcon(window):
sf = surface.SDL_CreateRGBSurface(
0, 16, 16, 16, 0xF000, 0x0F00, 0x00F0, 0x000F
Expand All @@ -461,7 +464,7 @@ def test_SDL_GetSetWindowData(window):
retval = sdl2.SDL_GetWindowData(window, k)
assert retval.contents.value == v.value

@pytest.mark.xfail(DRIVER_X11, reason="Wonky with some window managers")
@pytest.mark.xfail(DRIVER_X11 or DRIVER_WAYLAND, reason="Wonky with some window managers")
def test_SDL_GetSetWindowPosition(with_sdl):
window = _create_window(b"Test", 10, 200, 10, 10, 0)
px, py = c_int(0), c_int(0)
Expand Down