8000 [3.9] bpo-41682: fixed flaky test test_sendfile_close_peer_in_the_middle_of_receiving (GH-30845) by miss-islington · Pull Request #30861 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

[3.9] bpo-41682: fixed flaky test test_sendfile_close_peer_in_the_middle_of_receiving (GH-30845) #30861

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.

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

Merged
merged 1 commit into from
Jan 25, 2022

Conversation

miss-islington
Copy link
Contributor
@miss-islington miss-islington commented Jan 24, 2022

(cherry picked from commit 1c705fd)

Co-authored-by: Kumar Aditya 59607654+kumaraditya303@users.noreply.github.com

https://bugs.python.org/issue41682

(cherry picked from commit 1c705fd)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
@miss-islington
Copy link
Contributor Author

@kumaraditya303 and @pablogsal: Status check is done, and it's a failure ❌ .

@vstinner vstinner changed the title [3.9] fixed flaky test (GH-30845) [3.9] bpo-41682: fixed flaky test test_sendfile_close_peer_in_the_middle_of_receiving (GH-30845) Jan 25, 2022
@miss-islington
Copy link
Contributor Author

@kumaraditya303 and @pablogsal: Status check is done, and it's a success ✅ .

1 similar comment
@miss-islington
Copy link
Contributor Author

@kumaraditya303 and @pablogsal: Status check is done, and it's a success ✅ .

@vstinner vstinner merged commit f9ff0bf into python:3.9 Jan 25, 2022
@bedevere-bot
Copy link

@vstinner: Please replace # with GH- in the commit message next time. Thanks!

@miss-islington miss-islington deleted the backport-1c705fd-3.9 branch January 25, 2022 17:40
Comment on lines -90 to +96
8000
# 128 KiB plus small unaligned to buffer chunk
DATA = b"SendfileBaseData" * (1024 * 8 + 1)

# 256 KiB plus small unaligned to buffer chunk
# Newer versions of Windows seems to have increased its internal
# buffer and tries to send as much of the data as it can as it
# has some form of buffering for this which is less than 256KiB
# on newer server versions and Windows 11.
# So DATA should be larger than 256 KiB to make this test reliable.
DATA = b"x" * (1024 * 256 + 1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I keep coming back to this. I don't think it's worth changing anything (too much churn), but I would still like to point out that the original code had 16 bytes at the end of the 128 kb; the new code has only one extra byte after the 256 kb.

Also, this change affects almost all tests in this file, rather than just the one flaky test.

Finally, the use of "SendfileBaseData" as the dummy data seemed to be intentional to help debugging the test (e.g. test_sock_sendfile_mix_with_regular_send).

Just making sure you were aware of all these. :-)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't read the original PR. I only helped to backport the change because IMO it's better to run a test than skipping it in 3.9 and 3.10 branch.

@kumaraditya303: Do you want to write a PR to make changes suggested by @gvanrossum?

hello-adam pushed a commit to hello-adam/cpython that referenced this pull request Jun 2, 2022
…_receiving (pythonGH-30845) (python#30861)

(cherry picked from commit 1c705fd)

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>

Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
skip news tests Tests in the Lib/test dir
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants
0