Merge pull request #349 from lazka/fix-file-leaks

tests: Fix file leaks
pygobject · Oct 21, 2023 · 31f3000 · 31f3000
2 parents 6ff2866 + 45b3e97
commit 31f3000
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -45,7 +45,7 @@ jobs:
         run: |
           export SETUPTOOLS_USE_DISTUTILS=stdlib
           export CFLAGS="-std=c90 -Wall -Wno-long-long -Werror -coverage"
-          python -m coverage run --branch setup.py test
+          PYTHONDEVMODE=1 python -m coverage run --branch setup.py test
           python -m coverage xml -i
           python setup.py sdist
           python setup.py bdist_wheel
@@ -95,7 +95,7 @@ jobs:
     - name: Build & Test with setuptools
       run: |
         export CFLAGS="-Werror -coverage"
-        python -m coverage run --branch setup.py test
+        PYTHONDEVMODE=1 python -m coverage run --branch setup.py test
         python -m coverage xml -i
         python setup.py sdist
         python setup.py bdist_wheel
@@ -169,7 +169,7 @@ jobs:
           python -m pip install --upgrade pytest flake8 coverage hypothesis
           if (-not $?) { exit 1 }
           python -m pip install --upgrade pygame
-          python -m coverage run --branch setup.py test
+          python -X dev -m coverage run --branch setup.py test
           if (-not $?) { exit 1 }
           python -m coverage xml -i
           if (-not $?) { exit 1 }
@@ -211,7 +211,7 @@ jobs:
 
       - name: Build & Test with setuptools
         run: |
-          python3 -m coverage run --branch setup.py test
+          PYTHONDEVMODE=1 python3 -m coverage run --branch setup.py test
           python3 -m coverage xml -i
           python3 setup.py sdist
           python3 setup.py install --root="$(pwd)"/_root_abs

diff --git a/tests/test_api.py b/tests/test_api.py
@@ -1,7 +1,7 @@
 import os
 import io
 import sys
-import tempfile as tfi
+import tempfile
 import base64
 import zlib
 import shutil
@@ -50,7 +50,7 @@ def test_unicode_filenames():
     # missing under Python 3
 
     surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, 10, 10)
-    dirname = tfi.mkdtemp()
+    dirname = tempfile.mkdtemp()
     old_dir = os.getcwd()
     try:
         os.chdir(dirname)
@@ -90,17 +90,17 @@ def test_surface():
     assert s.get_width() == w
     assert s.get_height() == h
 
-    f, w, h = tfi.TemporaryFile(mode='w+b'), 100, 100
-    s = cairo.PDFSurface(f, w, h)
+    with tempfile.TemporaryFile(mode='w+b') as f:
+        cairo.PDFSurface(f, 100, 100)
 
-    f, w, h = tfi.TemporaryFile(mode='w+b'), 100, 100
-    s = cairo.PSSurface(f, w, h)
+    with tempfile.TemporaryFile(mode='w+b') as f:
+        cairo.PSSurface(f, 100, 100)
 
     s = cairo.RecordingSurface(cairo.CONTENT_COLOR, None)
     s = cairo.RecordingSurface(cairo.CONTENT_COLOR, (1, 1, 10, 10))
 
-    f, w, h = tfi.TemporaryFile(mode='w+b'), 100, 100
-    s = cairo.SVGSurface(f, w, h)
+    with tempfile.TemporaryFile(mode='w+b') as f:
+        cairo.SVGSurface(f, 100, 100)
 
 
 def test_surface_destroy_before_context():