passlib.tests: updated platform_crypt_support to reflect openbsd changes;

also cleaned up comments

3 files changed, 25 insertions, 8 deletions

diff --git a/passlib/tests/test_handlers.py b/passlib/tests/test_handlers.py
index 27c7fd4..c92e4ad 100644
--- a/passlib/tests/test_handlers.py
+++ b/passlib/tests/test_handlers.py
@@ -175,9 +175,14 @@ class _bsdi_crypt_test(HandlerCase):
     ]
 
     platform_crypt_support = [
-        ("freebsd|openbsd|netbsd|darwin", True),
+        # openbsd 5.8 dropped everything except bcrypt
+        ("openbsd[6789]", False),
+        ("openbsd5", None),
+        ("openbsd", True),
+
+        ("freebsd|netbsd|darwin", True),
         ("solaris", False),
-        # linux - may be present in libxcrypt
+        ("linux", None),  # may be present if libxcrypt is in use
     ]
 
     def test_77_fuzz_input(self, **kwds):
@@ -277,7 +282,12 @@ class _des_crypt_test(HandlerCase):
         ]
 
     platform_crypt_support = [
-        ("freebsd|openbsd|netbsd|linux|solaris|darwin", True),
+        # openbsd 5.8 dropped everything except bcrypt
+        ("openbsd[6789]", False),
+        ("openbsd5", None),
+        ("openbsd", True),
+
+        ("freebsd|netbsd|linux|solaris|darwin", True),
     ]
 
 # create test cases for specific backends
@@ -719,7 +729,12 @@ class _md5_crypt_test(HandlerCase):
         ]
 
     platform_crypt_support = [
-        ("freebsd|openbsd|netbsd|linux|solaris", True),
+        # openbsd 5.8 dropped everything except bcrypt
+        ("openbsd[6789]", False),
+        ("openbsd5", None),
+        ("openbsd", True),
+
+        ("freebsd|netbsd|linux|solaris", True),
         ("darwin", False),
     ]
 
@@ -1289,7 +1304,7 @@ class _sha1_crypt_test(HandlerCase):
     platform_crypt_support = [
         ("netbsd", True),
         ("freebsd|openbsd|solaris|darwin", False),
-        # linux - may be present in libxcrypt
+        ("linux", None),  # may be present if libxcrypt is in use
     ]
 
 # create test cases for specific backends
@@ -1425,9 +1440,9 @@ class _sha256_crypt_test(HandlerCase):
 
     platform_crypt_support = [
         ("freebsd(9|1\d)|linux", True),
-        ("freebsd8", None), # added in freebsd 8.3
+        ("freebsd8", None),  # added in freebsd 8.3
         ("freebsd|openbsd|netbsd|darwin", False),
-        # solaris - depends on policy
+        ("solaris", None),  # depends on policy
     ]
 
 # create test cases for specific backends
diff --git a/passlib/tests/test_handlers_bcrypt.py b/passlib/tests/test_handlers_bcrypt.py
index a573d4e..64fc8bf 100644
--- a/passlib/tests/test_handlers_bcrypt.py
+++ b/passlib/tests/test_handlers_bcrypt.py
@@ -162,7 +162,7 @@ class _bcrypt_test(HandlerCase):
         ("freedbsd|openbsd|netbsd", True),
         ("darwin", False),
         ("linux", None),  # may be present via addon, e.g. debian's libpam-unix2
-        ("solaris", None), # depends on system policy
+        ("solaris", None),  # depends on system policy
     ]
 
     #===================================================================
diff --git a/passlib/tests/utils.py b/passlib/tests/utils.py
index e204dd5..6a1cc85 100644
--- a/passlib/tests/utils.py
+++ b/passlib/tests/utils.py
@@ -3272,6 +3272,8 @@ class OsCryptMixin(HandlerCase):
 
         # look for first entry that matches current system
         # XXX: append "/" + platform.release() to string?
+        # XXX: probably should rework to support rows being dicts w/ "minver" / "maxver" keys,
+        #      instead of hack where we add major # as part of platform regex.
         using_backend = not self.using_patched_crypt
         name = self.handler.name
         platform = sys.platform