aboutsummaryrefslogtreecommitdiffstats
path: root/tests/utils.py
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-24 19:25:02 -0430
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-03-24 19:25:02 -0430
commit8573916ba3ea3b403f51ec4de4051db09fa91cda (patch)
treea56661e8b5df1377e9a59c6a72a70e12fef97e57 /tests/utils.py
parenteb98d47b925071acb3f0b1df6146a533525520fc (diff)
parent3888a84c2b7fc45adf3fa665880d554c1766165e (diff)
downloadcryptography-8573916ba3ea3b403f51ec4de4051db09fa91cda.tar.gz
cryptography-8573916ba3ea3b403f51ec4de4051db09fa91cda.tar.bz2
cryptography-8573916ba3ea3b403f51ec4de4051db09fa91cda.zip
Merge pull request #795 from public/split-vectors
Split vectors into cryptography_vectors
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 79996b6d..3e35970e 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -14,12 +14,13 @@
from __future__ import absolute_import, division, print_function
import collections
-import os
import pytest
import six
+import cryptography_vectors
+
HashVector = collections.namedtuple("HashVector", ["message", "digest"])
KeyedHashVector = collections.namedtuple(
@@ -67,10 +68,7 @@ def check_backend_support(item):
def load_vectors_from_file(filename, loader):
- base = os.path.join(
- os.path.dirname(__file__), "hazmat", "primitives", "vectors",
- )
- with open(os.path.join(base, filename), "r") as vector_file:
+ with cryptography_vectors.open_vector_file(filename) as vector_file:
return loader(vector_file)