|
 |
47c1c9 |
From bea141d25bd2bc4eea7527e2d6ec1d85b2b3806d Mon Sep 17 00:00:00 2001
|
|
|
47c1c9 |
From: Christian Heimes <cheimes@redhat.com>
|
|
|
47c1c9 |
Date: Thu, 29 Oct 2020 09:21:06 +0100
|
|
|
47c1c9 |
Subject: [PATCH 3] Skip iso8601 test cases
|
|
|
47c1c9 |
|
|
|
47c1c9 |
---
|
|
|
47c1c9 |
tests/test_fernet.py | 15 ++++++++++++++-
|
|
|
47c1c9 |
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
47c1c9 |
|
|
|
47c1c9 |
diff --git a/tests/test_fernet.py b/tests/test_fernet.py
|
|
|
47c1c9 |
index 38409b03e..343f3e4ec 100644
|
|
|
47c1c9 |
--- a/tests/test_fernet.py
|
|
|
47c1c9 |
+++ b/tests/test_fernet.py
|
|
|
47c1c9 |
@@ -10,7 +10,10 @@ import json
|
|
|
47c1c9 |
import os
|
|
|
47c1c9 |
import time
|
|
|
47c1c9 |
|
|
|
47c1c9 |
-import iso8601
|
|
|
47c1c9 |
+try:
|
|
|
47c1c9 |
+ import iso8601
|
|
|
47c1c9 |
+except ImportError:
|
|
|
47c1c9 |
+ iso8601 = None
|
|
|
47c1c9 |
|
|
|
47c1c9 |
import pytest
|
|
|
47c1c9 |
|
|
|
47c1c9 |
@@ -24,6 +27,12 @@ from cryptography.hazmat.primitives.ciphers import algorithms, modes
|
|
|
47c1c9 |
import cryptography_vectors
|
|
|
47c1c9 |
|
|
|
47c1c9 |
|
|
|
47c1c9 |
+skip_iso8601 = pytest.mark.skipif(
|
|
|
47c1c9 |
+ iso8601 is None,
|
|
|
47c1c9 |
+ reason="is8601 is not available"
|
|
|
47c1c9 |
+)
|
|
|
47c1c9 |
+
|
|
|
47c1c9 |
+
|
|
|
47c1c9 |
def json_parametrize(keys, filename):
|
|
|
47c1c9 |
vector_file = cryptography_vectors.open_vector_file(
|
|
|
47c1c9 |
os.path.join("fernet", filename), "r"
|
|
|
47c1c9 |
@@ -49,6 +58,7 @@ def test_default_backend():
|
|
|
47c1c9 |
skip_message="Does not support AES CBC",
|
|
|
47c1c9 |
)
|
|
|
47c1c9 |
class TestFernet(object):
|
|
|
47c1c9 |
+ @skip_iso8601
|
|
|
47c1c9 |
@json_parametrize(
|
|
|
47c1c9 |
("secret", "now", "iv", "src", "token"),
|
|
|
47c1c9 |
"generate.json",
|
|
|
47c1c9 |
@@ -62,6 +72,7 @@ class TestFernet(object):
|
|
|
47c1c9 |
)
|
|
|
47c1c9 |
assert actual_token == token.encode("ascii")
|
|
|
47c1c9 |
|
|
|
47c1c9 |
+ @skip_iso8601
|
|
|
47c1c9 |
@json_parametrize(
|
|
|
47c1c9 |
("secret", "now", "src", "ttl_sec", "token"),
|
|
|
47c1c9 |
"verify.json",
|
|
|
47c1c9 |
@@ -81,6 +92,7 @@ class TestFernet(object):
|
|
|
47c1c9 |
payload = f.decrypt(token.encode("ascii"), ttl=ttl_sec)
|
|
|
47c1c9 |
assert payload == src.encode("ascii")
|
|
|
47c1c9 |
|
|
|
47c1c9 |
+ @skip_iso8601
|
|
|
47c1c9 |
@json_parametrize(("secret", "token", "now", "ttl_sec"), "invalid.json")
|
|
|
47c1c9 |
def test_invalid(self, secret, token, now, ttl_sec, backend, monkeypatch):
|
|
|
47c1c9 |
f = Fernet(secret.encode("ascii"), backend=backend)
|
|
|
47c1c9 |
@@ -117,6 +129,7 @@ class TestFernet(object):
|
|
|
47c1c9 |
with pytest.raises(TypeError):
|
|
|
47c1c9 |
f.decrypt(u"")
|
|
|
47c1c9 |
|
|
|
47c1c9 |
+ @skip_iso8601
|
|
|
47c1c9 |
def test_timestamp_ignored_no_ttl(self, monkeypatch, backend):
|
|
|
47c1c9 |
f = Fernet(base64.urlsafe_b64encode(b"\x00" * 32), backend=backend)
|
|
|
47c1c9 |
pt = b"encrypt me"
|
|
|
47c1c9 |
--
|
|
|
47c1c9 |
2.26.2
|
|
|
47c1c9 |
|