python-pillow/Pillow
1
1
Fork 0
mirror of https://github.com/python-pillow/Pillow.git synced 2025-02-04 21:50:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use proper tempdir for temporary test files.

Browse Source 
Writing temporary files in source tree is just wrong. Instead, use
a directory inside system tempdir.
This commit is contained in:
Michał Górny 2013-04-21 11:05:31 +02:00
parent d1c6db88d4
commit c01696bf2d
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/run.py
View File

@ -2,7 +2,7 @@ from __future__ import print_function
# minimal test runner # minimal test runner
import glob, os, sys import glob, os, os.path, sys, tempfile
try: try:
root = os.path.dirname(__file__) root = os.path.dirname(__file__)
@ -73,7 +73,8 @@ for file in files:
print("-"*68) print("-"*68)
tempfiles = glob.glob(os.path.join(root, "temp_*")) temp_root = os.path.join(tempfile.gettempdir(), 'pillow-tests')
tempfiles = glob.glob(os.path.join(temp_root, "temp_*"))
if tempfiles: if tempfiles:
print("===", "remaining temporary files") print("===", "remaining temporary files")
for file in tempfiles: for file in tempfiles:

17
Tests/tester.py
View File

@ -171,11 +171,16 @@ def assert_image_similar(a, b, epsilon, msg=None):
success() success()
def tempfile(template, *extra): def tempfile(template, *extra):
import os, sys import os, os.path, sys, tempfile
files = [] files = []
root = os.path.join(tempfile.gettempdir(), 'pillow-tests')
try:
os.mkdir(root)
except OSError:
pass
for temp in (template,) + extra: for temp in (template,) + extra:
assert temp[:5] in ("temp.", "temp_") assert temp[:5] in ("temp.", "temp_")
root, name = os.path.split(sys.argv[0]) name = os.path.basename(sys.argv[0])
name = temp[:4] + os.path.splitext(name)[0][4:] name = temp[:4] + os.path.splitext(name)[0][4:]
name = name + "_%d" % len(_tempfiles) + temp[4:] name = name + "_%d" % len(_tempfiles) + temp[4:]
name = os.path.join(root, name) name = os.path.join(root, name)
@ -229,12 +234,18 @@ def _setup():
if success.count and not failure.count: if success.count and not failure.count:
print("ok") print("ok")
# only clean out tempfiles if test passed # only clean out tempfiles if test passed
import os import os, os.path, tempfile
for file in _tempfiles: for file in _tempfiles:
try: try:
os.remove(file) os.remove(file)
except OSError: except OSError:
pass # report? pass # report?
temp_root = os.path.join(tempfile.gettempdir(), 'pillow-tests')
try:
os.rmdir(temp_root)
except OSError:
pass
if "--coverage" in sys.argv: if "--coverage" in sys.argv:
import coverage import coverage
coverage.stop() coverage.stop()