From 8b30e5ae337c36588df295a6c9d66aaca169fe75 Mon Sep 17 00:00:00 2001 From: Andrew Standley <17914999+airstandley@users.noreply.github.com> Date: Tue, 17 Sep 2019 11:06:26 -0700 Subject: [PATCH] Fix marshmallow test helpers so that they work will all unittest compatible frameworks and not just pytest. 'python setup.py test' works again. (#127) --- tests/helpers.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/helpers.py b/tests/helpers.py index 51d3f900..abfe6e99 100644 --- a/tests/helpers.py +++ b/tests/helpers.py @@ -1,11 +1,10 @@ -import pytest - +import unittest from flask_rebar.compat import MARSHMALLOW_V2, MARSHMALLOW_V3 -skip_if_marshmallow_not_v2 = pytest.mark.skipif( +skip_if_marshmallow_not_v2 = unittest.skipIf( not MARSHMALLOW_V2, reason="Only applicable for Marshmallow version 2" ) -skip_if_marshmallow_not_v3 = pytest.mark.skipif( +skip_if_marshmallow_not_v3 = unittest.skipIf( not MARSHMALLOW_V3, reason="Only applicable for Marshmallow version 3" )