Fix tests to be explicit about window

Baekalfen · Dec 27, 2024 · 2312e96 · 2312e96
1 parent 019cf27
commit 2312e96
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/tests/test_basics.py b/tests/test_basics.py
@@ -15,6 +15,11 @@
 from pyboy.api.tile import Tile
 from pyboy.utils import WindowEvent, cython_compiled
 
+try:
+    import sdl2
+except ImportError:
+    sdl2 = None
+
 
 def test_log_level_none(default_rom, capsys):
     pyboy = PyBoy(default_rom, window="null")
@@ -183,9 +188,11 @@ def test_argv_parser(*args):
         assert flags[k] == v
 
 
-@pytest.mark.skipif(cython_compiled, reason="This test requires access to internal functions not available in Cython")
+@pytest.mark.skipif(
+    cython_compiled or not sdl2, reason="This test requires access to internal functions not available in Cython"
+)
 def test_no_input_enabled(default_rom):
-    pyboy = PyBoy(default_rom, no_input=True)
+    pyboy = PyBoy(default_rom, window="SDL2", no_input=True)
     pyboy.set_emulation_speed(0)
     with mock.patch("pyboy.plugins.window_sdl2.sdl2_event_pump", return_value=[WindowEvent(WindowEvent.PAUSE)]):
         pyboy.tick()
@@ -200,9 +207,11 @@ def test_no_input_enabled(default_rom):
     assert not pyboy.paused
 
 
-@pytest.mark.skipif(cython_compiled, reason="This test requires access to internal functions not available in Cython")
+@pytest.mark.skipif(
+    cython_compiled or not sdl2, reason="This test requires access to internal functions not available in Cython"
+)
 def test_no_input_disabled(default_rom):
-    pyboy = PyBoy(default_rom, no_input=False)
+    pyboy = PyBoy(default_rom, window="SDL2", no_input=False)
     pyboy.set_emulation_speed(0)
     with mock.patch("pyboy.plugins.window_sdl2.sdl2_event_pump", return_value=[WindowEvent(WindowEvent.PAUSE)]):
         pyboy.tick()

diff --git a/tests/test_memoryview.py b/tests/test_memoryview.py
@@ -10,7 +10,7 @@
 
 
 def test_memoryview(default_rom, boot_rom):
-    p = PyBoy(default_rom, bootrom=boot_rom)
+    p = PyBoy(default_rom, window="null", bootrom=boot_rom)
 
     with open(default_rom, "rb") as f:
         rom_bytes = [ord(f.read(1)) for x in range(16)]
@@ -97,7 +97,7 @@ def test_memoryview(default_rom, boot_rom):
 
 
 def test_cgb_banks(cgb_acid_file):  # Any CGB file
-    p = PyBoy(cgb_acid_file)
+    p = PyBoy(cgb_acid_file, window="null")
 
     # Read VRAM banks through both aliases
     assert p.memory[0, 0x8000:0x8010] == [0] * 16