Refactor tests to stop duplicating vectors (#78)

1 files changed, 72 insertions, 142 deletions

diff --git a/tests/test_bcrypt.py b/tests/test_bcrypt.py
index 428fe86..b506a7a 100644
--- a/tests/test_bcrypt.py
+++ b/tests/test_bcrypt.py
@@ -7,56 +7,7 @@ import six
 import bcrypt
 
 
-def test_gensalt_basic(monkeypatch):
-    monkeypatch.setattr(os, "urandom", lambda n: b"0000000000000000")
-    assert bcrypt.gensalt() == b"$2b$12$KB.uKB.uKB.uKB.uKB.uK."
-
-
-@pytest.mark.parametrize(("rounds", "expected"), [
-    (4, b"$2b$04$KB.uKB.uKB.uKB.uKB.uK."),
-    (5, b"$2b$05$KB.uKB.uKB.uKB.uKB.uK."),
-    (6, b"$2b$06$KB.uKB.uKB.uKB.uKB.uK."),
-    (7, b"$2b$07$KB.uKB.uKB.uKB.uKB.uK."),
-    (8, b"$2b$08$KB.uKB.uKB.uKB.uKB.uK."),
-    (9, b"$2b$09$KB.uKB.uKB.uKB.uKB.uK."),
-    (10, b"$2b$10$KB.uKB.uKB.uKB.uKB.uK."),
-    (11, b"$2b$11$KB.uKB.uKB.uKB.uKB.uK."),
-    (12, b"$2b$12$KB.uKB.uKB.uKB.uKB.uK."),
-    (13, b"$2b$13$KB.uKB.uKB.uKB.uKB.uK."),
-    (14, b"$2b$14$KB.uKB.uKB.uKB.uKB.uK."),
-    (15, b"$2b$15$KB.uKB.uKB.uKB.uKB.uK."),
-    (16, b"$2b$16$KB.uKB.uKB.uKB.uKB.uK."),
-    (17, b"$2b$17$KB.uKB.uKB.uKB.uKB.uK."),
-    (18, b"$2b$18$KB.uKB.uKB.uKB.uKB.uK."),
-    (19, b"$2b$19$KB.uKB.uKB.uKB.uKB.uK."),
-    (20, b"$2b$20$KB.uKB.uKB.uKB.uKB.uK."),
-    (21, b"$2b$21$KB.uKB.uKB.uKB.uKB.uK."),
-    (22, b"$2b$22$KB.uKB.uKB.uKB.uKB.uK."),
-    (23, b"$2b$23$KB.uKB.uKB.uKB.uKB.uK."),
-    (24, b"$2b$24$KB.uKB.uKB.uKB.uKB.uK."),
-])
-def test_gensalt_rounds_valid(rounds, expected, monkeypatch):
-    monkeypatch.setattr(os, "urandom", lambda n: b"0000000000000000")
-    assert bcrypt.gensalt(rounds) == expected
-
-
-@pytest.mark.parametrize("rounds", list(range(1, 4)))
-def test_gensalt_rounds_invalid(rounds):
-    with pytest.raises(ValueError):
-        bcrypt.gensalt(rounds)
-
-
-def test_gensalt_bad_prefix():
-    with pytest.raises(ValueError):
-        bcrypt.gensalt(prefix="bad")
-
-
-def test_gensalt_2a_prefix(monkeypatch):
-    monkeypatch.setattr(os, "urandom", lambda n: b"0000000000000000")
-    assert bcrypt.gensalt(prefix=b"2a") == b"$2a$12$KB.uKB.uKB.uKB.uKB.uK."
-
-
-@pytest.mark.parametrize(("password", "salt", "expected"), [
+_test_vectors = [
     (
         b"Kk4DQuMMfZL9o",
         b"$2b$04$cVWp4XaNU8a4v1uMRum2SO",
@@ -157,108 +108,26 @@ def test_gensalt_2a_prefix(monkeypatch):
         b"$2b$04$VvlCUKbTMjaxaYJ.k5juoe",
         b"$2b$04$VvlCUKbTMjaxaYJ.k5juoecpG/7IzcH1AkmqKi.lIZMVIOLClWAk.",
     ),
-])
-def test_hashpw_new(password, salt, expected):
-    assert bcrypt.hashpw(password, salt) == expected
-
-
-@pytest.mark.parametrize(("password", "hashed"), [
-    (
-        b"Kk4DQuMMfZL9o",
-        b"$2b$04$cVWp4XaNU8a4v1uMRum2SO026BWLIoQMD/TXg5uZV.0P.uO8m3YEm",
-    ),
-    (
-        b"9IeRXmnGxMYbs",
-        b"$2b$04$pQ7gRO7e6wx/936oXhNjrOUNOHL1D0h1N2IDbJZYs.1ppzSof6SPy",
-    ),
-    (
-        b"xVQVbwa1S0M8r",
-        b"$2b$04$SQe9knOzepOVKoYXo9xTteNYr6MBwVz4tpriJVe3PNgYufGIsgKcW",
-    ),
-    (
-        b"Zfgr26LWd22Za",
-        b"$2b$04$eH8zX.q5Q.j2hO1NkVYJQOM6KxntS/ow3.YzVmFrE4t//CoF4fvne",
-    ),
-    (
-        b"Tg4daC27epFBE",
-        b"$2b$04$ahiTdwRXpUG2JLRcIznxc.s1.ydaPGD372bsGs8NqyYjLY1inG5n2",
-    ),
-    (
-        b"xhQPMmwh5ALzW",
-        b"$2b$04$nQn78dV0hGHf5wUBe0zOFu8n07ZbWWOKoGasZKRspZxtt.vBRNMIy",
-    ),
-    (
-        b"59je8h5Gj71tg",
-        b"$2b$04$cvXudZ5ugTg95W.rOjMITuM1jC0piCl3zF5cmGhzCibHZrNHkmckG",
-    ),
-    (
-        b"wT4fHJa2N9WSW",
-        b"$2b$04$YYjtiq4Uh88yUsExO0RNTuEJ.tZlsONac16A8OcLHleWFjVawfGvO",
-    ),
-    (
-        b"uSgFRnQdOgm4S",
-        b"$2b$04$WLTjgY/pZSyqX/fbMbJzf.qxCeTMQOzgL.CimRjMHtMxd/VGKojMu",
-    ),
-    (
-        b"tEPtJZXur16Vg",
-        b"$2b$04$2moPs/x/wnCfeQ5pCheMcuSJQ/KYjOZG780UjA/SiR.KsYWNrC7SG",
-    ),
-    (
-        b"vvho8C6nlVf9K",
-        b"$2b$04$HrEYC/AQ2HS77G78cQDZQ.r44WGcruKw03KHlnp71yVQEwpsi3xl2",
-    ),
-    (
-        b"5auCCY9by0Ruf",
-        b"$2b$04$vVYgSTfB8KVbmhbZE/k3R.ux9A0lJUM4CZwCkHI9fifke2.rTF7MG",
-    ),
-    (
-        b"GtTkR6qn2QOZW",
-        b"$2b$04$JfoNrR8.doieoI8..F.C1OQgwE3uTeuardy6lw0AjALUzOARoyf2m",
-    ),
-    (
-        b"zKo8vdFSnjX0f",
-        b"$2b$04$HP3I0PUs7KBEzMBNFw7o3O7f/uxaZU7aaDot1quHMgB2yrwBXsgyy",
-    ),
-    (
-        b"I9VfYlacJiwiK",
-        b"$2b$04$xnFVhJsTzsFBTeP3PpgbMeMREb6rdKV9faW54Sx.yg9plf4jY8qT6",
-    ),
-    (
-        b"VFPO7YXnHQbQO",
-        b"$2b$04$WQp9.igoLqVr6Qk70mz6xuRxE0RttVXXdukpR9N54x17ecad34ZF6",
-    ),
-    (
-        b"VDx5BdxfxstYk",
-        b"$2b$04$xgZtlonpAHSU/njOCdKztOPuPFzCNVpB4LGicO4/OGgHv.uKHkwsS",
-    ),
-    (
-        b"dEe6XfVGrrfSH",
-        b"$2b$04$2Siw3Nv3Q/gTOIPetAyPr.GNj3aO0lb1E5E9UumYGKjP9BYqlNWJe",
-    ),
-    (
-        b"cTT0EAFdwJiLn",
-        b"$2b$04$7/Qj7Kd8BcSahPO4khB8me4ssDJCW3r4OGYqPF87jxtrSyPj5cS5m",
-    ),
-    (
-        b"J8eHUDuxBB520",
-        b"$2b$04$VvlCUKbTMjaxaYJ.k5juoecpG/7IzcH1AkmqKi.lIZMVIOLClWAk.",
-    ),
     (
         b"U*U",
+        b"$2a$05$CCCCCCCCCCCCCCCCCCCCC.",
         b"$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW",
     ),
     (
         b"U*U*",
+        b"$2a$05$CCCCCCCCCCCCCCCCCCCCC.",
         b"$2a$05$CCCCCCCCCCCCCCCCCCCCC.VGOzA784oUp/Z0DY336zx7pLYAy0lwK",
     ),
     (
         b"U*U*U",
+        b"$2a$05$XXXXXXXXXXXXXXXXXXXXXO",
         b"$2a$05$XXXXXXXXXXXXXXXXXXXXXOAcXxm9kjPGEMsLznoKqmqw7tc8WCx4a",
     ),
     (
         b"0123456789abcdefghijklmnopqrstuvwxyz"
         b"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
         b"chars after 72 are ignored",
+        b"$2a$05$abcdefghijklmnopqrstuu",
         b"$2a$05$abcdefghijklmnopqrstuu5s2v8.iXieOjg/.AySBTTZIIVFJeBui",
     ),
     (
@@ -269,18 +138,17 @@ def test_hashpw_new(password, salt, expected):
         b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
         b"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
         b"chars after 72 are ignored as usual",
+        b"$2a$05$/OK.fbVrR/bpIqNJ5ianF.",
         b"$2a$05$/OK.fbVrR/bpIqNJ5ianF.swQOIzjOiJ9GHEPuhEkvqrUyvWhEMx6"
     ),
     (
         b"\xa3",
+        b"$2a$05$/OK.fbVrR/bpIqNJ5ianF.",
         b"$2a$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq"
     ),
-])
-def test_hashpw_existing(password, hashed):
-    assert bcrypt.hashpw(password, hashed) == hashed
+]
 
-
-@pytest.mark.parametrize(("password", "hashed", "expected"), [
+_2y_test_vectors = [
     (
         b"\xa3",
         b"$2y$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
@@ -291,7 +159,69 @@ def test_hashpw_existing(password, hashed):
         b"$2y$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
         b"$2b$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
     ),
+]
+
+
+def test_gensalt_basic(monkeypatch):
+    monkeypatch.setattr(os, "urandom", lambda n: b"0000000000000000")
+    assert bcrypt.gensalt() == b"$2b$12$KB.uKB.uKB.uKB.uKB.uK."
+
+
+@pytest.mark.parametrize(("rounds", "expected"), [
+    (4, b"$2b$04$KB.uKB.uKB.uKB.uKB.uK."),
+    (5, b"$2b$05$KB.uKB.uKB.uKB.uKB.uK."),
+    (6, b"$2b$06$KB.uKB.uKB.uKB.uKB.uK."),
+    (7, b"$2b$07$KB.uKB.uKB.uKB.uKB.uK."),
+    (8, b"$2b$08$KB.uKB.uKB.uKB.uKB.uK."),
+    (9, b"$2b$09$KB.uKB.uKB.uKB.uKB.uK."),
+    (10, b"$2b$10$KB.uKB.uKB.uKB.uKB.uK."),
+    (11, b"$2b$11$KB.uKB.uKB.uKB.uKB.uK."),
+    (12, b"$2b$12$KB.uKB.uKB.uKB.uKB.uK."),
+    (13, b"$2b$13$KB.uKB.uKB.uKB.uKB.uK."),
+    (14, b"$2b$14$KB.uKB.uKB.uKB.uKB.uK."),
+    (15, b"$2b$15$KB.uKB.uKB.uKB.uKB.uK."),
+    (16, b"$2b$16$KB.uKB.uKB.uKB.uKB.uK."),
+    (17, b"$2b$17$KB.uKB.uKB.uKB.uKB.uK."),
+    (18, b"$2b$18$KB.uKB.uKB.uKB.uKB.uK."),
+    (19, b"$2b$19$KB.uKB.uKB.uKB.uKB.uK."),
+    (20, b"$2b$20$KB.uKB.uKB.uKB.uKB.uK."),
+    (21, b"$2b$21$KB.uKB.uKB.uKB.uKB.uK."),
+    (22, b"$2b$22$KB.uKB.uKB.uKB.uKB.uK."),
+    (23, b"$2b$23$KB.uKB.uKB.uKB.uKB.uK."),
+    (24, b"$2b$24$KB.uKB.uKB.uKB.uKB.uK."),
 ])
+def test_gensalt_rounds_valid(rounds, expected, monkeypatch):
+    monkeypatch.setattr(os, "urandom", lambda n: b"0000000000000000")
+    assert bcrypt.gensalt(rounds) == expected
+
+
+@pytest.mark.parametrize("rounds", list(range(1, 4)))
+def test_gensalt_rounds_invalid(rounds):
+    with pytest.raises(ValueError):
+        bcrypt.gensalt(rounds)
+
+
+def test_gensalt_bad_prefix():
+    with pytest.raises(ValueError):
+        bcrypt.gensalt(prefix="bad")
+
+
+def test_gensalt_2a_prefix(monkeypatch):
+    monkeypatch.setattr(os, "urandom", lambda n: b"0000000000000000")
+    assert bcrypt.gensalt(prefix=b"2a") == b"$2a$12$KB.uKB.uKB.uKB.uKB.uK."
+
+
+@pytest.mark.parametrize(("password", "salt", "hashed"), _test_vectors)
+def test_hashpw_new(password, salt, hashed):
+    assert bcrypt.hashpw(password, salt) == hashed
+
+
+@pytest.mark.parametrize(("password", "salt", "hashed"), _test_vectors)
+def test_hashpw_existing(password, salt, hashed):
+    assert bcrypt.hashpw(password, hashed) == hashed
+
+
+@pytest.mark.parametrize(("password", "hashed", "expected"), _2y_test_vectors)
 def test_hashpw_2y_prefix(password, hashed, expected):
     assert bcrypt.hashpw(password, hashed) == expected
 
@@ -317,7 +247,7 @@ def test_hashpw_str_salt():
         )
 
 
-def test_nul_byte():
+def test_hashpw_nul_byte():
     salt = bcrypt.gensalt(4)
     with pytest.raises(ValueError):
         bcrypt.hashpw(b"abc\0def", salt)