Control: tags 1064708 + patch Control: tags 1064708 + pending
Dear maintainer,
I've prepared an NMU for pygame (versioned as 2.5.2-1.2) and
uploaded it.
Regards.
diff -Nru pygame-2.5.2/debian/changelog pygame-2.5.2/debian/changelog
--- pygame-2.5.2/debian/changelog 2024-01-10 06:32:39.000000000 +0100
+++ pygame-2.5.2/debian/changelog 2024-04-04 00:36:09.000000000 +0200
@@ -1,3 +1,13 @@
+pygame (2.5.2-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Matthias Klose ]
+ * Skip surface tests that fail when SDL_VIDEODRIVER=dummy #4169.
+ (Closes: #1064708)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Thu, 04 Apr 2024
00:36:09 +0200
+
pygame (2.5.2-1.1) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru pygame-2.5.2/debian/patches/4169.diff
pygame-2.5.2/debian/patches/4169.diff
--- pygame-2.5.2/debian/patches/4169.diff 1970-01-01 01:00:00.000000000
+0100
+++ pygame-2.5.2/debian/patches/4169.diff 2024-03-19 11:05:54.000000000
+0100
@@ -0,0 +1,44 @@
+diff --git a/test/surface_test.py b/test/surface_test.py
+index e6dc1ad095..b1147d278f 100644
+--- a/test/surface_test.py
++++ b/test/surface_test.py
+@@ -1091,6 +1091,10 @@ def test_image_convert_bug_131(self):
+ finally:
+ pygame.display.quit()
+
++ @unittest.skipIf(
++ os.environ.get("SDL_VIDEODRIVER") == "dummy",
++ 'requires a non-"dummy" SDL_VIDEODRIVER',
++ )
+ def test_convert_init(self):
+ """Ensure initialization exceptions are raised
+ for surf.convert()."""
+@@ -1101,12 +1105,11 @@ def test_convert_init(self):
+
+ pygame.display.init()
+ try:
+- if os.environ.get("SDL_VIDEODRIVER") != "dummy":
+- try:
+- surf.convert(32)
+- surf.convert(pygame.Surface((1, 1)))
+- except pygame.error:
+- self.fail("convert() should not raise an exception here.")
++ try:
++ surf.convert(32)
++ surf.convert(pygame.Surface((1, 1)))
++ except pygame.error:
++ self.fail("convert() should not raise an exception here.")
+
+ self.assertRaisesRegex(pygame.error, "No video mode",
surf.convert)
+
+@@ -1118,6 +1121,10 @@ def test_convert_init(self):
+ finally:
+ pygame.display.quit()
+
++ @unittest.skipIf(
++ os.environ.get("SDL_VIDEODRIVER") == "dummy",
++ 'requires a non-"dummy" SDL_VIDEODRIVER',
++ )
+ def test_convert_alpha_init(self):
+ """Ensure initialization exceptions are raised
+ for surf.convert_alpha()."""
diff -Nru pygame-2.5.2/debian/patches/series pygame-2.5.2/debian/patches/series
--- pygame-2.5.2/debian/patches/series 2024-01-10 06:32:39.000000000 +0100
+++ pygame-2.5.2/debian/patches/series 2024-04-04 00:34:56.000000000 +0200
@@ -3,3 +3,4 @@
s390x-time-test.patch
4048.diff
ignore-test-machinery-issue.diff
+4169.diff
OpenPGP_signature.asc
Description: OpenPGP digital signature
