From 2b3f94271209883aab4181ac5401c699c5c60b75 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Tue, 24 Dec 2013 21:55:24 -0800 Subject: Move stuff around and coverage --- tests/utils.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index 94f97d59..82021a5f 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): -- cgit v1.2.3 From 5a8fdf82f396609ccb971d707edddea58f2d3917 Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 26 Dec 2013 20:13:45 -0600 Subject: add mark that allows us to do skip tests on backends via decorators --- tests/utils.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index 82021a5f..113488d3 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -24,6 +24,16 @@ def check_for_iface(name, iface, item): )) +def supported_by_backend_skip(item): + supported = item.keywords.get("supported") + if supported and "backend" in item.funcargs: + if not supported.kwargs["only_if"](item.funcargs["backend"]): + pytest.skip(supported.kwargs["skip_message"]) + elif supported: + raise TypeError("This mark is only available on methods that take a " + "backend") + + def load_vectors_from_file(filename, loader): base = os.path.join( os.path.dirname(__file__), "hazmat", "primitives", "vectors", -- cgit v1.2.3 From 60fc8da5aad59fd61b891c3538ce61d96e91cbcb Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Thu, 26 Dec 2013 20:19:34 -0600 Subject: rename the method to be less horribly named --- tests/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index 113488d3..7ae2eb8b 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -24,7 +24,7 @@ def check_for_iface(name, iface, item): )) -def supported_by_backend_skip(item): +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"]): -- cgit v1.2.3 From ec49550b1f29c52164a3f4bca7779e7dc23d397f Mon Sep 17 00:00:00 2001 From: Paul Kehrer Date: Fri, 27 Dec 2013 15:51:40 -0600 Subject: change typeerror to valueerror --- tests/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/utils.py') diff --git a/tests/utils.py b/tests/utils.py index 7ae2eb8b..beb2ca5d 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -30,8 +30,8 @@ def check_backend_support(item): if not supported.kwargs["only_if"](item.funcargs["backend"]): pytest.skip(supported.kwargs["skip_message"]) elif supported: - raise TypeError("This mark is only available on methods that take a " - "backend") + raise ValueError("This mark is only available on methods that take a " + "backend") def load_vectors_from_file(filename, loader): -- cgit v1.2.3