Merge pull request #2675 from pygame-community/ankith26-pytest

Minor changes to support pytest

Author: ankith26

test/display_test.py

@@ -832,7 +832,7 @@ def test_set_gamma_ramp(self):
         pygame.display.quit()
 
 
-class FullscreenToggleTests(unittest.TestCase):
+class FullscreenToggleTestsInteractive(unittest.TestCase):
     __tags__ = ["interactive"]
 
     screen = None

test/font_test.py

@@ -1031,7 +1031,7 @@ def test_font_property_should_raise_exception_after_quit(self):
 
 
 @unittest.skipIf(IS_PYPY, "pypy skip known failure")  # TODO
-class VisualTests(unittest.TestCase):
+class VisualTestsInteractive(unittest.TestCase):
     __tags__ = ["interactive"]
 
     screen = None

test/ftfont_test.py

@@ -1,7 +1,8 @@
 import sys
 import os
 import unittest
-from pygame.tests import font_test
+
+from . import font_test
 
 import pygame.ftfont
 

test/image_test.py

@@ -19,7 +19,7 @@
     )
 
 
-def test_magic(f, magic_hexes):
+def check_magic(f, magic_hexes):
     """Tests a given file to see if the magic hex matches."""
     data = f.read(len(magic_hexes))
     if len(data) != len(magic_hexes):
@@ -326,7 +326,7 @@ def test_save(self):
                     # Test the magic numbers at the start of the file to ensure
                     # they are saved as the correct file type.
                     self.assertEqual(
-                        (1, fmt), (test_magic(handle, magic_hex[fmt.lower()]), fmt)
+                        (1, fmt), (check_magic(handle, magic_hex[fmt.lower()]), fmt)
                     )
 
                 # load the file to make sure it was saved correctly.
@@ -410,7 +410,7 @@ def test_save__to_fileobject_w_namehint_argument(self):
                         # ensure they are saved as the correct file type.
                         handle.seek(0)
                         self.assertEqual(
-                            (1, fmt), (test_magic(handle, magic_hex[fmt.lower()]), fmt)
+                            (1, fmt), (check_magic(handle, magic_hex[fmt.lower()]), fmt)
                         )
                     # load the file to make sure it was saved correctly.
                     handle.flush()
@@ -1344,7 +1344,7 @@ def test_save_extended(self):
             with open(temp_file_name, "rb") as file:
                 # Test the magic numbers at the start of the file to ensure
                 # they are saved as the correct file type.
-                self.assertEqual(1, (test_magic(file, magic_hex[fmt.lower()])))
+                self.assertEqual(1, (check_magic(file, magic_hex[fmt.lower()])))
             # load the file to make sure it was saved correctly
             loaded_file = pygame.image.load(temp_file_name)
             self.assertEqual(loaded_file.get_at((0, 0)), surf.get_at((0, 0)))