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.

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

gh-108303: Move smtpd to test.support #114368

Merged
merged 1 commit into from
Jan 22, 2024
Merged

Conversation

sobolevn
Copy link
Member

@sobolevn sobolevn commented Jan 21, 2024

This module was removed from stdlib in #93246
But, since it is not really a test file, it should have been moved to Lib/test/support, not Lib/test. This PR fixes that :)

Now this is in line with asyncore and asynchat.

@sobolevn sobolevn requested review from a team and vsajip as code owners January 21, 2024 07:19
@sobolevn sobolevn added skip news needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Jan 21, 2024
@AlexWaygood AlexWaygood changed the title gh-108303: Move stmpd to test.support gh-108303: Move smtpd to test.support Jan 21, 2024
@vstinner vstinner removed the needs backport to 3.11 only security fixes label Jan 22, 2024
@vstinner
Copy link
Member

This change should not be backported to 3.11: it was done in Python 3.12.

Copy link
Member

@vstinner vstinner left a comment

Choose a reason for hiding this comment

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

LGTM.

@@ -63,9 +64,6 @@
from socketserver import (ThreadingUDPServer, DatagramRequestHandler,
ThreadingTCPServer, StreamRequestHandler)

with warnings.catch_warnings():
Copy link
Member

Choose a reason for hiding this comment

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

The change removes with warnings.catch_warnings(): but apparently, it's useless. The test still pass without it:

$ ./python -Werror -m test test_logging test_smtplib -j0
Using random seed: 1598323201
0:00:00 load avg: 0.96 Run 2 tests in parallel using 2 worker processes
0:00:02 load avg: 1.37 [1/2] test_smtplib passed
0:00:18 load avg: 1.22 [2/2] test_logging passed

== Tests result: SUCCESS ==

All 2 tests OK.

Total duration: 18.9 sec
Total tests: run=317 skipped=2
Total test files: run=2/2
Result: SUCCESS

@vstinner vstinner merged commit 8f5e7d7 into python:main Jan 22, 2024
34 checks passed
@miss-islington-app
Copy link

Thanks @sobolevn for the PR, and @vstinner for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 22, 2024
Update test_logging.py and test_smtplib.py.
(cherry picked from commit 8f5e7d7)

Co-authored-by: Nikita Sobolev <[email protected]>
@bedevere-app
Copy link

bedevere-app bot commented Jan 22, 2024

GH-114427 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Jan 22, 2024
@vstinner
Copy link
Member

Merged, thanks.

vstinner pushed a commit that referenced this pull request Jan 22, 2024
gh-108303: Move `smtpd` to `test.support` (GH-114368)

Update test_logging.py and test_smtplib.py.
(cherry picked from commit 8f5e7d7)

Co-authored-by: Nikita Sobolev <[email protected]>
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
Update test_logging.py and test_smtplib.py.
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
Update test_logging.py and test_smtplib.py.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants