Cleanup of tests expecting an exception (using py.test instead or rewritten).

Author: Rebecka Gulliksson

src/jwkest/__init__.py

@@ -166,10 +166,7 @@ def b64d(b):
     :param b: bytes
     """
 
-    if b.endswith(b'='):  # shouldn't but there you are
-        cb = b.split(b'=')[0]
-    else:
-        cb = b
+    cb = b.rstrip(b"=")  # shouldn't but there you are
 
     # Python's base64 functions ignore invalid characters, so we need to
     # check for them explicitly.

tests/test_0_jwkest.py

@@ -1,6 +1,7 @@
+import base64
 import os
 import struct
-from jwkest import long2intarr
+from jwkest import long2intarr, b64d, b64e
 from jwkest import intarr2long
 from jwkest import base64_to_long
 from jwkest import long_to_base64
@@ -14,11 +15,13 @@
 def full_path(local_file):
     return os.path.join(BASEDIR, local_file)
 
+
 CERT = full_path("cert.pem")
 KEY = full_path("server.key")
 
 _CKEY = pem_cert2rsa(CERT)
 
+
 def test_long_intarr_long():
     ia = long2intarr(_CKEY.n)
     _n = intarr2long(ia)
@@ -39,5 +42,16 @@ def test_long_base64_long():
     assert _CKEY.n == l
 
 
+def test_b64d_with_padded_data():
+    data = "abcd".encode("utf-8")
+    encoded = base64.urlsafe_b64encode(data)
+    assert b64d(encoded) == data
+
+
+def test_b64_encode_decode():
+    data = "abcd".encode("utf-8")
+    assert b64d(b64e(data)) == data
+
+
 if __name__ == "__main__":
-    test_long_base64_long()
+    test_long_base64_long()