From be28a243b2ca27a569cb732003e3ebde69ed75b7 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 2 Jul 2015 00:05:49 -0400 Subject: Improved coverage for tests, handle multiple pytest.mark.supported decorators on one function --- tests/utils.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index 8be5c1fa..c810303e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -53,7 +53,10 @@ 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"]): + if not all( + mark.kwargs["only_if"](item.funcargs["backend"]) + for mark in supported + ): pytest.skip("{0} ({1})".format( supported.kwargs["skip_message"], item.funcargs["backend"] )) -- cgit v1.2.3 From 50ebb489852b8c9dd02d08e09375aa00859999bf Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Thu, 2 Jul 2015 00:21:41 -0400 Subject: fixed tests --- tests/utils.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index c810303e..5083d48c 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -53,13 +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 all( - mark.kwargs["only_if"](item.funcargs["backend"]) - for mark in supported - ): - 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") -- cgit v1.2.3