From 1fed65224f2b5912f8d28cf6de47577f287088e9 Mon Sep 17 00:00:00 2001 From: Paul McMillan Date: Fri, 30 Dec 2011 20:35:44 +0000 Subject: [PATCH] Increased pbkdf2 scaling test vectors to lower chance of false test failures. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17308 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- tests/regressiontests/utils/crypto.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/regressiontests/utils/crypto.py b/tests/regressiontests/utils/crypto.py index 5c861c63575..7889ddd43f2 100644 --- a/tests/regressiontests/utils/crypto.py +++ b/tests/regressiontests/utils/crypto.py @@ -125,9 +125,11 @@ class TestUtilsCryptoPBKDF2(unittest.TestCase): Theory: If you run with 100 iterations, it should take 100 times as long as running with 1 iteration. """ - n1, n2 = 100, 10000 + n1, n2 = 1000, 100000 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.1 so that tests don't + #fail nondeterministically too often. self.assertLess(measured_scale_exponent, 1.1)