From d96830115feb9e472c07da5d8982d44a9abbaaa3 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Fri, 4 Mar 2022 15:22:41 +1100 Subject: [PATCH] Updated tests --- Tests/test_file_ppm.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Tests/test_file_ppm.py b/Tests/test_file_ppm.py index fc930e314..0e4f1ba68 100644 --- a/Tests/test_file_ppm.py +++ b/Tests/test_file_ppm.py @@ -50,7 +50,7 @@ def test_pnm(tmp_path): assert_image_equal_tofile(im, f) -def test_not_ppm(tmp_path): +def test_magic(tmp_path): path = str(tmp_path / "temp.ppm") with open(path, "wb") as f: f.write(b"PyInvalid") @@ -69,10 +69,10 @@ def test_header_with_comments(tmp_path): assert im.size == (128, 128) -def test_nondecimal_header(tmp_path): +def test_non_integer_token(tmp_path): path = str(tmp_path / "temp.ppm") with open(path, "wb") as f: - f.write(b"P6\n128\x00") + f.write(b"P6\nTEST") with pytest.raises(ValueError): with Image.open(path): @@ -82,32 +82,38 @@ def test_nondecimal_header(tmp_path): def test_token_too_long(tmp_path): path = str(tmp_path / "temp.ppm") with open(path, "wb") as f: - f.write(b"P6\n 0123456789") + f.write(b"P6\n 01234567890") - with pytest.raises(ValueError): + with pytest.raises(ValueError) as e: with Image.open(path): pass + assert str(e.value) == "Token too long in file header: b'01234567890'" + def test_too_many_colors(tmp_path): path = str(tmp_path / "temp.ppm") with open(path, "wb") as f: f.write(b"P6\n1 1\n1000\n") - with pytest.raises(ValueError): + with pytest.raises(ValueError) as e: with Image.open(path): pass + assert str(e.value) == "Too many colors for band: 1000" + def test_truncated_file(tmp_path): path = str(tmp_path / "temp.pgm") with open(path, "w") as f: f.write("P6") - with pytest.raises(ValueError): + with pytest.raises(ValueError) as e: with Image.open(path): pass + assert str(e.value) == "Reached EOF while reading header" + def test_neg_ppm(): # Storage.c accepted negative values for xsize, ysize. the