From: Serhiy Storchaka <storchaka@gmail.com>
Date: Wed, 25 Oct 2017 13:30:13 +0000 (+0300)
Subject: bpo-31664: Fix test_crypt for the openwall implementation of crypt. (#4116)
X-Git-Tag: v3.7.0a3~308
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f261583bae7e60e410709ed96398dd1b14c5454;p=python

bpo-31664: Fix test_crypt for the openwall implementation of crypt. (#4116)
---

diff --git a/Lib/test/test_crypt.py b/Lib/test/test_crypt.py
index 8db1aefdf1..796fd076c6 100644
--- a/Lib/test/test_crypt.py
+++ b/Lib/test/test_crypt.py
@@ -57,7 +57,13 @@ class CryptTestCase(unittest.TestCase):
     def test_invalid_log_rounds(self):
         for log_rounds in (1, -1, 999):
             salt = crypt.mksalt(crypt.METHOD_BLOWFISH, log_rounds=log_rounds)
-            self.assertIsNone(crypt.crypt('mypassword', salt))
+            cr = crypt.crypt('mypassword', salt)
+            if cr is not None:
+                # On failure the openwall implementation returns a magic
+                # string that is shorter than 13 characters and is guaranteed
+                # to differ from a salt.
+                self.assertNotEqual(cr, salt)
+                self.assertLess(len(cr), 13)
 
 
 if __name__ == "__main__":