Move stuff around and coverage
diff --git a/tests/conftest.py b/tests/conftest.py
index 91ba988..e059b63 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -4,7 +4,7 @@
HMACBackend, CipherBackend, HashBackend
)
-from .skip_check import skip_check
+from .utils import check_for_iface
def pytest_generate_tests(metafunc):
@@ -16,6 +16,6 @@
@pytest.mark.trylast
def pytest_runtest_setup(item):
- skip_check('hmac', HMACBackend, item)
- skip_check('cipher', CipherBackend, item)
- skip_check('hash', HashBackend, item)
+ check_for_iface("hmac", HMACBackend, item)
+ check_for_iface("cipher", CipherBackend, item)
+ check_for_iface("hash", HashBackend, item)
diff --git a/tests/skip_check.py b/tests/skip_check.py
deleted file mode 100644
index 42a152e..0000000
--- a/tests/skip_check.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from __future__ import absolute_import, division, print_function
-
-import pytest
-
-
-def skip_check(name, iface, item):
- if name in item.keywords and "backend" in item.funcargs:
- if not isinstance(item.funcargs["backend"], iface):
- pytest.skip("{0} backend does not support {1}".format(
- item.funcargs["backend"], name
- ))
diff --git a/tests/test_skip_check.py b/tests/test_skip_check.py
deleted file mode 100644
index 73a6e56..0000000
--- a/tests/test_skip_check.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from __future__ import absolute_import, division, print_function
-
-import pretend
-
-import pytest
-
-from .skip_check import skip_check
-
-
-class FakeInterface(object):
- pass
-
-
-def test_skip_check():
- item = pretend.stub(keywords=["fake_name"], funcargs={"backend": True})
- with pytest.raises(pytest.skip.Exception) as exc_info:
- skip_check("fake_name", FakeInterface, item)
- assert exc_info.value.args[0] == "True backend does not support fake_name"
diff --git a/tests/test_utils.py b/tests/test_utils.py
index 5c58fd7..a65091f 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -14,14 +14,33 @@
import os
import textwrap
+import pretend
+
import pytest
from .utils import (
load_nist_vectors, load_vectors_from_file, load_cryptrec_vectors,
- load_openssl_vectors, load_hash_vectors,
+ load_openssl_vectors, load_hash_vectors, check_for_iface
)
+class FakeInterface(object):
+ pass
+
+
+def test_check_for_iface():
+ item = pretend.stub(keywords=["fake_name"], funcargs={"backend": True})
+ with pytest.raises(pytest.skip.Exception) as exc_info:
+ check_for_iface("fake_name", FakeInterface, item)
+ assert exc_info.value.args[0] == "True backend does not support fake_name"
+
+ item = pretend.stub(
+ keywords=["fake_name"],
+ funcargs={"backend": FakeInterface()}
+ )
+ check_for_iface("fake_name", FakeInterface, item)
+
+
def test_load_nist_vectors():
vector_data = textwrap.dedent("""
# CAVS 11.1
diff --git a/tests/utils.py b/tests/utils.py
index 94f97d5..82021a5 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -11,7 +11,17 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import os.path
+import os
+
+import pytest
+
+
+def check_for_iface(name, iface, item):
+ if name in item.keywords and "backend" in item.funcargs:
+ if not isinstance(item.funcargs["backend"], iface):
+ pytest.skip("{0} backend does not support {1}".format(
+ item.funcargs["backend"], name
+ ))
def load_vectors_from_file(filename, loader):