aboutsummaryrefslogtreecommitdiffstats
path: root/tests/utils.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-07-03 03:52:39 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2015-07-03 03:52:39 -0400
commit53a36a1f8cd7c6bf243d5a5ad5522b0a592bba3d (patch)
tree6e8ec078cf59bd7d7ea2f94747aba82175298688 /tests/utils.py
parentf5a4519f7ead73cbca826f3d7c815dd8963efb0a (diff)
parent23cafe861f4da2d7261a41bc57801b226e6b8c1b (diff)
downloadcryptography-53a36a1f8cd7c6bf243d5a5ad5522b0a592bba3d.tar.gz
cryptography-53a36a1f8cd7c6bf243d5a5ad5522b0a592bba3d.tar.bz2
cryptography-53a36a1f8cd7c6bf243d5a5ad5522b0a592bba3d.zip
Merge branch 'master' into encode-san
Diffstat (limited to 'tests/utils.py')
-rw-r--r--tests/utils.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 8be5c1fa..5083d48c 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -53,10 +53,11 @@ def skip_if_empty(backend_list, required_interfaces):
def check_backend_support(item):
supported = item.keywords.get("supported")
if supported and "backend" in item.funcargs:
- if not supported.kwargs["only_if"](item.funcargs["backend"]):
- pytest.skip("{0} ({1})".format(
- supported.kwargs["skip_message"], item.funcargs["backend"]
- ))
+ for mark in supported:
+ if not mark.kwargs["only_if"](item.funcargs["backend"]):
+ pytest.skip("{0} ({1})".format(
+ mark.kwargs["skip_message"], item.funcargs["backend"]
+ ))
elif supported:
raise ValueError("This mark is only available on methods that take a "
"backend")