aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-07-01 22:44:41 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-07-01 22:44:41 -0500
commit651476fca6c761b37df04f71bbebbfbe863a524b (patch)
treee5368e1470ec767b1480b18451d46b787497feee
parent8228028e2b40561726fc447ecfdaed13a8925425 (diff)
parent9bbd4900bc4db86b675aaf6c22c034a071150d5a (diff)
downloadcryptography-651476fca6c761b37df04f71bbebbfbe863a524b.tar.gz
cryptography-651476fca6c761b37df04f71bbebbfbe863a524b.tar.bz2
cryptography-651476fca6c761b37df04f71bbebbfbe863a524b.zip
Merge pull request #2097 from alex/test-iface
Fixed #1689 -- correctly handle code with multiple requires_backend_itnerface
-rw-r--r--tests/conftest.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/conftest.py b/tests/conftest.py
index c4d6b9c1..6599a643 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -18,11 +18,13 @@ def pytest_generate_tests(metafunc):
if "backend" in metafunc.fixturenames:
filtered_backends = []
required = metafunc.function.requires_backend_interface
- required_interfaces = tuple(
+ required_interfaces = [
mark.kwargs["interface"] for mark in required
- )
+ ]
for backend in selected_backends:
- if isinstance(backend, required_interfaces):
+ if all(
+ isinstance(backend, iface) for iface in required_interfaces
+ ):
filtered_backends.append(backend)
# If you pass an empty list to parametrize Bad Things(tm) happen