-
-
Notifications
You must be signed in to change notification settings - Fork 30.5k
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-116622: Mock the passage of time in Android logcat rate limit tests #124015
Conversation
@@ -78,6 +79,7 @@ def assert_log(self, level, tag, expected, *, skip=False, timeout=0.5): | |||
def tearDown(self): | |||
self.logcat_process.terminate() | |||
self.logcat_process.wait(LOOPBACK_TIMEOUT) | |||
self.logcat_thread.join(LOOPBACK_TIMEOUT) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This fixes an unrelated warning I saw while running the tests repeatedly with -F
:
Warning -- threading._dangling was modified by test_android
Warning -- Before: {<weakref at 0x7c15b68e00; to 'threading._MainThread' at 0x7c18f5fcb0>}
Warning -- After: {<weakref at 0x7c186e3ce0; to 'threading._MainThread' at 0x7c18f5fcb0>, <weakref at 0x7c1870ef20; to 'threading.Thread' at 0x7c183faa50>}
@@ -369,6 +371,8 @@ def write(b, lines=None, *, write_len=None): | |||
): | |||
stream.write(obj) | |||
|
|||
|
|||
class TestAndroidRateLimit(unittest.TestCase): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This test doesn't read its own output, so it doesn't need the @skipIf
or the setUp
from the other class.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
Thanks @mhsmith for the PR, and @freakboy3742 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13. |
…t tests (pythonGH-124015) Mock the passage of time in Android logcat rate limit tests (cherry picked from commit f554883) Co-authored-by: Malcolm Smith <[email protected]> Co-authored-by: Russell Keith-Magee <[email protected]>
GH-124035 is a backport of this pull request to the 3.13 branch. |
…it tests (GH-124015) (#124035) gh-116622: Mock the passage of time in Android logcat rate limit tests (GH-124015) Mock the passage of time in Android logcat rate limit tests (cherry picked from commit f554883) Co-authored-by: Malcolm Smith <[email protected]> Co-authored-by: Russell Keith-Magee <[email protected]>
The emulator on the buildbot is apparently subject to wild swings in performance, so the only way to make this test reliable is to take the test machine's real clock out of the equation.