Enforce garbage collection after more ext tests

Author: a-hurst

sdl2/test/sdl2ext_renderer_test.py

@@ -1,3 +1,4 @@
+import gc
 import sys
 import pytest
 from ctypes import addressof
@@ -8,14 +9,6 @@
 from sdl2.render import SDL_Renderer, SDL_Texture
 from sdl2.surface import SDL_CreateRGBSurface, SDL_FreeSurface
 
-_ISPYPY = hasattr(sys, "pypy_version_info")
-
-if _ISPYPY:
-    import gc
-    dogc = gc.collect
-else:
-    dogc = lambda: None
-
 
 class TestSDL2ExtRenderer(object):
     __tags__ = ["sdl", "sdl2ext"]
@@ -31,6 +24,9 @@ def setup_class(cls):
     def teardown_class(cls):
         sdl2ext.quit()
 
+    def teardown_method(self):
+        gc.collect()
+
     def check_pixels(self, view, w, h, sprite, c1, c2, cx=0, cy=0):
         msg = "color mismatch at %d,%d: %d not in %s"
         cx = cx + sprite.x
@@ -95,15 +91,13 @@ def test_init(self):
         assert renderer.rendertarget == sprite
         assert isinstance(renderer.sdlrenderer.contents, SDL_Renderer)
         renderer.destroy()
-        dogc()
 
         # Create renderer with Window
         window = sdl2ext.Window("Test", size=(1, 1))
         renderer = sdl2ext.Renderer(window)
         assert renderer.rendertarget == window
         assert isinstance(renderer.sdlrenderer.contents, SDL_Renderer)
         renderer.destroy()
-        dogc()
 
         # Create renderer with SDL_Window
         sdlwindow = window.window
@@ -122,7 +116,6 @@ def test_init(self):
             sdl2ext.Renderer(1234)
         with pytest.raises(TypeError):
             sdl2ext.Renderer("test")
-        dogc()
 
     def test_logical_size(self):
         sf = SDL_CreateRGBSurface(0, 10, 10, 32, 0, 0, 0, 0)
@@ -209,7 +202,6 @@ def test_Renderer_color(self):
         del view
         renderer.destroy()
         SDL_FreeSurface(sf)
-        dogc()
 
     @pytest.mark.skip("not implemented")
     def test_Renderer_blendmode(self):
@@ -237,7 +229,6 @@ def test_Renderer_clear(self):
         del view
         renderer.destroy()
         SDL_FreeSurface(sf)
-        dogc()
 
     def test_Renderer_copy(self):
         # Initialize target surface and renderer

sdl2/test/sdl2ext_spritesystem_test.py

@@ -1,3 +1,4 @@
+import gc
 import sys
 import pytest
 from ctypes import ArgumentError
@@ -9,18 +10,8 @@
 )
 from sdl2.surface import SDL_Surface, SDL_CreateRGBSurface, SDL_FreeSurface
 
-
-_ISPYPY = hasattr(sys, "pypy_version_info")
-
-
 RESOURCES = Resources(__file__, "resources")
 
-if _ISPYPY:
-    import gc
-    dogc = gc.collect
-else:
-    dogc = lambda: None
-
 
 class TestSDL2ExtSpriteSystem(object):
     __tags__ = ["sdl", "sdl2ext"]
@@ -36,6 +27,9 @@ def setup_class(cls):
     def teardown_class(cls):
         sdl2ext.quit()
 
+    def teardown_method(self):
+        gc.collect()
+
     def check_pixels(self, view, w, h, sprite, c1, c2, cx=0, cy=0):
         msg = "color mismatch at %d,%d: %d not in %s"
         cx = cx + sprite.x
@@ -77,7 +71,6 @@ def test_SpriteFactory(self):
             sdl2ext.SpriteFactory(123)
         with pytest.raises(ValueError):
             sdl2ext.SpriteFactory(sdl2ext.TEXTURE)
-        dogc()
 
     def test_SpriteFactory_create_sprite(self):
         window = sdl2ext.Window("Test", size=(1, 1))
@@ -97,7 +90,6 @@ def test_SpriteFactory_create_sprite(self):
                     continue
                 sprite = tfactory.create_sprite(size=(w, h))
                 assert isinstance(sprite, sdl2ext.TextureSprite)
-        dogc()
 
     def test_SpriteFactory_create_software_sprite(self):
         factory = sdl2ext.SpriteFactory(sdl2ext.SOFTWARE)
@@ -122,7 +114,6 @@ def test_SpriteFactory_create_software_sprite(self):
         with pytest.raises((ArgumentError, TypeError)):
             factory.create_software_sprite(size=(10, 10),
                           masks=("Test", 1, 2, 3))
-        dogc()
 
     def test_SpriteFactory_create_texture_sprite(self):
         window = sdl2ext.Window("Test", size=(1, 1))
@@ -141,7 +132,6 @@ def test_SpriteFactory_create_texture_sprite(self):
                                                    access=flag)
             assert isinstance(sprite, sdl2ext.TextureSprite)
             del sprite
-        dogc()
 
     def test_SpriteFactory_from_image(self):
         window = sdl2ext.Window("Test", size=(1, 1))
@@ -161,7 +151,6 @@ def test_SpriteFactory_from_image(self):
                 factory.from_image(None)
             with pytest.raises(ValueError):
                 factory.from_image(12345)
-        dogc()
 
     @pytest.mark.skip("not implemented")
     def test_SpriteFactory_from_object(self):
@@ -192,7 +181,6 @@ def test_SpriteFactory_from_surface(self):
             # TODO: crashes pypy 2.0
             #self.assertRaises((AttributeError, ArgumentError, TypeError),
             #                  factory.from_surface, 1234)
-        dogc()
 
     def test_SpriteFactory_from_text(self):
         sfactory = sdl2ext.SpriteFactory(sdl2ext.SOFTWARE)
@@ -217,7 +205,6 @@ def test_SpriteFactory_from_text(self):
                                          fontmanager=fm)
         sprite = tfactory.from_text("Test", alias="tuffy")
         assert isinstance(sprite, sdl2ext.TextureSprite)
-        dogc()
 
     def test_SpriteRenderSystem(self):
         renderer = sdl2ext.SpriteRenderSystem()
@@ -275,7 +262,6 @@ def test_SoftwareSpriteRenderSystem(self):
         assert renderer.sortfunc is not None
         assert not (sdl2ext.Sprite in renderer.componenttypes)
         assert sdl2ext.SoftwareSprite in renderer.componenttypes
-        dogc()
 
     def test_SoftwareSpriteRenderSystem_render(self):
         sf1 = SDL_CreateRGBSurface(0, 12, 7, 32, 0, 0, 0, 0)