Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Consolidate getdata and putdata tests #8017

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Consolidate getdata and putdata tests #8017

wants to merge 9 commits into from

Conversation

Yay295
Copy link
Contributor

@Yay295 Yay295 commented Apr 25, 2024

Moved all of the getdata and putdata tests to the same file (because test_getdata_putdata doesn't fit in either individual file), and parametrized two tests.

@radarhere radarhere mentioned this pull request Apr 27, 2024
Closed
@radarhere
Copy link
Member

test_image_getdata_putdata.py seems like a mouthful. How about just test_image_data.py?

@Yay295
Copy link
Contributor Author

Yay295 commented Apr 28, 2024

sure

@radarhere
Copy link
Member

Moved all of the getdata and putdata tests to the same file (because test_getdata_putdata doesn't fit in either individual file)

Sorry, I've just realised what this meant. In main, we currently have test_image_getdata.py and test_image_putdata.py, and here you've merged them together into a single file because you'd like to find a new home for a test from test_image.py / #7209, and you don't think a roundtrip test belongs in either file.

I think test_image_putdata.py already has roundtrip tests, using both getdata() and putdata().

Pillow/Tests/test_image_putdata.py

Lines 60 to 68 in c250a44

@pytest.mark.parametrize("mode", ("I", "I;16", "I;16L", "I;16B"))
def test_mode_i(mode: str) -> None:
src = hopper("L")
data = list(src.getdata())
im = Image.new(mode, src.size, 0)
im.putdata(data, 2, 256)
target = [2 * elt + 256 for elt in data]
assert list(im.getdata()) == target

@Yay295
Copy link
Contributor Author

Yay295 commented Apr 28, 2024

I'd say those should be in the combined file for the same reason. Though I suppose I shouldn't have added putdata to those function names.

@Yay295
Copy link
Contributor Author

Yay295 commented Apr 28, 2024

Cleaned up the tests a bit more.

@Yay295 Yay295 force-pushed the test_consolidation branch 4 times, most recently from 9b10658 to ba83ec4 Compare May 15, 2024 16:30
@Yay295
Copy link
Contributor Author

Yay295 commented May 15, 2024

rebased, multiple times because I didn't check it locally and kept missing something when resolving the conflict

@Yay295 Yay295 force-pushed the test_consolidation branch 2 times, most recently from e9c0ae5 to db1764a Compare June 25, 2024 16:01
@Yay295 Yay295 force-pushed the test_consolidation branch 2 times, most recently from 2ce6977 to 81f1cd0 Compare June 28, 2024 20:32
@Yay295 Yay295 force-pushed the test_consolidation branch 2 times, most recently from d3b0a6a to 8d9ab96 Compare July 19, 2024 13:19
@Yay295 Yay295 force-pushed the test_consolidation branch 2 times, most recently from 66bf305 to d248a8b Compare August 1, 2024 15:00
Yay295 and others added 9 commits October 12, 2024 18:33
@Yay295
move getdata/putdata tests to same file
9e3209e
@Yay295
parametrize test_getdata_roundtrip()
ed07332
@Yay295
parametrize test_putdata_long_integers()
c18d17a 
This test had some duplicate checks because originally in Python 2 the numbers in those lines had a "L" suffix, which is no longer used in Python 3.
@Yay295
remove old comment
1a29485 
The original bug this was referring to seems to have been lost, but it looks to have been something to do with Python 2/3 compatibility and big numbers.
See commit c8ce29c and python-pillow#7991.
@Yay295 @nulano
rename variable "pixel" to "expected"
ce4ead7 
Co-authored-by: Ondrej Baranovič <[email protected]>
@Yay295
rename test_image_getdata_putdata.py to test_image_data.py
9951947
@Yay295
parametrize test_putdata_array()
c9d7bea
@Yay295
merge test_putdata_mode_I() and test_putdata_mode_F() as test_putdata…
28731ad 
…_scale_and_offset()
@Yay295
remove test_putdata_mode_BGR(), superseded by test_getdata_putdata()
a96e38c
@Yay295
Copy link
Contributor Author

Yay295 commented Oct 17, 2024

What is currently blocking this from being merged?

@radarhere
Copy link
Member

As I've said, my opinion is that this change isn't needed. If others think it is though, feel free to outvote me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nulano nulano nulano left review comments

Assignees
No one assigned
Labels
Testing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Yay295 @radarhere @nulano