diff options
author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2022-10-11 14:13:43 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-11 23:13:43 +0200 |
commit | a44cc0a895590e9292193c46d344a14c511e7f33 (patch) | |
tree | 9d42069e2f419f1d5a4aca1a2e26db49280984bc | |
parent | 4f1364ca032dac87ef08988ec89d682efc7fa6d2 (diff) | |
download | cpython-git-a44cc0a895590e9292193c46d344a14c511e7f33.tar.gz |
[3.8] gh-96710: Make the test timing more lenient for the int/str DoS regression test. (GH-96717) (#98197)
gh-96710: Make the test timing more lenient for the int/str DoS regression test. (GH-96717)
A regression would still absolutely fail and even a flaky pass isn't
harmful as it'd fail most of the time across our N system test runs.
Windows has a low resolution timer and CI systems are prone to odd
timing so this just gives more leeway to avoid flakiness.
(cherry picked from commit 11e3548fd1d3445ccde971d613633b58d73c3016)
Co-authored-by: Gregory P. Smith <greg@krypto.org>
-rw-r--r-- | Lib/test/test_int.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Lib/test/test_int.py b/Lib/test/test_int.py index cbbddf5063..a8bb99a9e6 100644 --- a/Lib/test/test_int.py +++ b/Lib/test/test_int.py @@ -644,7 +644,8 @@ class IntStrDigitLimitsTests(unittest.TestCase): self.assertEqual(len(huge_decimal), digits) # Ensuring that we chose a slow enough conversion to measure. # It takes 0.1 seconds on a Zen based cloud VM in an opt build. - if seconds_to_convert < 0.005: + # Some OSes have a low res 1/64s timer, skip if hard to measure. + if seconds_to_convert < 1/64: raise unittest.SkipTest('"slow" conversion took only ' f'{seconds_to_convert} seconds.') @@ -656,7 +657,7 @@ class IntStrDigitLimitsTests(unittest.TestCase): str(huge_int) seconds_to_fail_huge = get_time() - start self.assertIn('conversion', str(err.exception)) - self.assertLess(seconds_to_fail_huge, seconds_to_convert/8) + self.assertLessEqual(seconds_to_fail_huge, seconds_to_convert/2) # Now we test that a conversion that would take 30x as long also fails # in a similarly fast fashion. @@ -667,7 +668,7 @@ class IntStrDigitLimitsTests(unittest.TestCase): str(extra_huge_int) seconds_to_fail_extra_huge = get_time() - start self.assertIn('conversion', str(err.exception)) - self.assertLess(seconds_to_fail_extra_huge, seconds_to_convert/8) + self.assertLess(seconds_to_fail_extra_huge, seconds_to_convert/2) def test_denial_of_service_prevented_str_to_int(self): """Regression test: ensure we fail before performing O(N**2) work.""" @@ -685,7 +686,8 @@ class IntStrDigitLimitsTests(unittest.TestCase): seconds_to_convert = get_time() - start # Ensuring that we chose a slow enough conversion to measure. # It takes 0.1 seconds on a Zen based cloud VM in an opt build. - if seconds_to_convert < 0.005: + # Some OSes have a low res 1/64s timer, skip if hard to measure. + if seconds_to_convert < 1/64: raise unittest.SkipTest('"slow" conversion took only ' f'{seconds_to_convert} seconds.') @@ -695,7 +697,7 @@ class IntStrDigitLimitsTests(unittest.TestCase): int(huge) seconds_to_fail_huge = get_time() - start self.assertIn('conversion', str(err.exception)) - self.assertLess(seconds_to_fail_huge, seconds_to_convert/8) + self.assertLessEqual(seconds_to_fail_huge, seconds_to_convert/2) # Now we test that a conversion that would take 30x as long also fails # in a similarly fast fashion. @@ -706,7 +708,7 @@ class IntStrDigitLimitsTests(unittest.TestCase): int(extra_huge) seconds_to_fail_extra_huge = get_time() - start self.assertIn('conversion', str(err.exception)) - self.assertLess(seconds_to_fail_extra_huge, seconds_to_convert/8) + self.assertLessEqual(seconds_to_fail_extra_huge, seconds_to_convert/2) def test_power_of_two_bases_unlimited(self): """The limit does not apply to power of 2 bases.""" |