Use pytest.mark.parametrize r=@saimn
This commit is contained in:
@@ -45,26 +45,16 @@ def test_generate_image(tmpdir):
|
||||
assert im.size == size
|
||||
|
||||
|
||||
def test_generate_gif_image_passthrough(tmpdir):
|
||||
"Test the generate_image function with gif images."
|
||||
dstfile = str(tmpdir.join(TEST_GIF_IMAGE))
|
||||
settings = create_settings()
|
||||
generate_image(SRC_GIF_FILE, dstfile, settings)
|
||||
# Check the file was copied, not (sym)linked
|
||||
st_src = os.stat(SRC_GIF_FILE)
|
||||
st_dst = os.stat(dstfile)
|
||||
assert st_src.st_size == st_dst.st_size
|
||||
assert not os.path.samestat(st_src, st_dst)
|
||||
|
||||
|
||||
def test_generate_image_passthrough(tmpdir):
|
||||
@pytest.mark.parametrize(("image", "path"), [(TEST_IMAGE, SRCFILE),
|
||||
(TEST_GIF_IMAGE, SRC_GIF_FILE)])
|
||||
def test_generate_image_passthrough(tmpdir, image, path):
|
||||
"Test the generate_image function with use_orig=True."
|
||||
|
||||
dstfile = str(tmpdir.join(TEST_IMAGE))
|
||||
dstfile = str(tmpdir.join(image))
|
||||
settings = create_settings(use_orig=True)
|
||||
generate_image(SRCFILE, dstfile, settings)
|
||||
generate_image(path, dstfile, settings)
|
||||
# Check the file was copied, not (sym)linked
|
||||
st_src = os.stat(SRCFILE)
|
||||
st_src = os.stat(path)
|
||||
st_dst = os.stat(dstfile)
|
||||
assert st_src.st_size == st_dst.st_size
|
||||
assert not os.path.samestat(st_src, st_dst)
|
||||
@@ -93,36 +83,23 @@ def test_generate_image_processor(tmpdir):
|
||||
generate_image(SRCFILE, dstfile, settings)
|
||||
|
||||
|
||||
def test_generate_thumbnail(tmpdir):
|
||||
@pytest.mark.parametrize(
|
||||
("image", "path", "wide_size", "high_size"),
|
||||
[(TEST_IMAGE, SRCFILE, (185, 150), (150, 122)),
|
||||
(TEST_GIF_IMAGE, SRC_GIF_FILE, (127, 150), (150, 177))])
|
||||
def test_generate_thumbnail(tmpdir, image, path, wide_size, high_size):
|
||||
"Test the generate_thumbnail function."
|
||||
|
||||
dstfile = str(tmpdir.join(TEST_IMAGE))
|
||||
dstfile = str(tmpdir.join(image))
|
||||
delay = 0
|
||||
for size in [(200, 150), (150, 200)]:
|
||||
generate_thumbnail(SRCFILE, dstfile, size, delay)
|
||||
generate_thumbnail(path, dstfile, size, delay)
|
||||
im = Image.open(dstfile)
|
||||
assert im.size == size
|
||||
|
||||
for size, thumb_size in [((200, 150), (185, 150)),
|
||||
((150, 200), (150, 122))]:
|
||||
generate_thumbnail(SRCFILE, dstfile, size, delay, fit=False)
|
||||
im = Image.open(dstfile)
|
||||
assert im.size == thumb_size
|
||||
|
||||
|
||||
def test_generate_gif_thumbnail(tmpdir):
|
||||
"Test the generate_thumbnail function."
|
||||
|
||||
dstfile = str(tmpdir.join(TEST_GIF_IMAGE))
|
||||
delay = 0
|
||||
for size in [(200, 150), (150, 200)]:
|
||||
generate_thumbnail(SRC_GIF_FILE, dstfile, size, delay)
|
||||
im = Image.open(dstfile)
|
||||
assert im.size == size
|
||||
|
||||
for size, thumb_size in [((200, 150), (127, 150)),
|
||||
((150, 200), (150, 177))]:
|
||||
generate_thumbnail(SRC_GIF_FILE, dstfile, size, delay, fit=False)
|
||||
for size, thumb_size in [((200, 150), wide_size),
|
||||
((150, 200), high_size)]:
|
||||
generate_thumbnail(path, dstfile, size, delay, fit=False)
|
||||
im = Image.open(dstfile)
|
||||
assert im.size == thumb_size
|
||||
|
||||
|
||||
Reference in New Issue
Block a user