Ticket #18687: 18687.diff

tests/regressiontests/utils/crypto.py

@@ -139 +139 @@
         # These values are chosen as a reasonable tradeoff between time
         # to run the test suite and false positives caused by imprecise
         # measurement.
-        n1, n2 = 200000, 800000
-        elapsed = lambda f: timeit.Timer(f,
+        n1, n2 = 1000, 20000
+        elapsed = lambda f: timeit.Timer(f,
                     'from django.utils.crypto import pbkdf2').timeit(number=1)
         t1 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n1)
         t2 = elapsed('pbkdf2("password", "salt", iterations=%d)' % n2)
         measured_scale_exponent = math.log(t2 / t1, n2 / n1)
-        # This should be less than 1. We allow up to 1.2 so that tests don't
+        # This should be less than 1. We allow up to 2.0 so that tests don't
         # fail nondeterministically too often.
-        self.assertLess(measured_scale_exponent, 1.2)
+        self.assertLess(measured_scale_exponent, 2.0)