Skip to content

Commit

Permalink
Merge branch 'master' into BP-778/Issue-125/improve-swagger-support-f…
Browse files Browse the repository at this point in the history
…or-authenticators
  • Loading branch information
airstandley authored Sep 17, 2019
2 parents 3a2ba26 + 8b30e5a commit 89bbca7
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions tests/helpers.py
Original file line number Diff line number Diff line change
@@ -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"
)

0 comments on commit 89bbca7

Please sign in to comment.