Fix marshmallow test helpers so that they work will all unittest compatible frameworks and not just pytest. 'python setup.py test' works again. (plangrid#127)

airstandley · web-flow · commit 8b30e5ae337c · 2019-09-17T11:06:26.000-07:00
diff --git 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"
 )

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`		`-import pytest`
`2`		`-`
	`1`	`+import unittest`
`3`	`2`	`from flask_rebar.compat import MARSHMALLOW_V2, MARSHMALLOW_V3`
`4`	`3`
`5`	`4`
`6`		`-skip_if_marshmallow_not_v2 = pytest.mark.skipif(`
	`5`	`+skip_if_marshmallow_not_v2 = unittest.skipIf(`
`7`	`6`	`not MARSHMALLOW_V2, reason="Only applicable for Marshmallow version 2"`
`8`	`7`	`)`
`9`		`-skip_if_marshmallow_not_v3 = pytest.mark.skipif(`
	`8`	`+skip_if_marshmallow_not_v3 = unittest.skipIf(`
`10`	`9`	`not MARSHMALLOW_V3, reason="Only applicable for Marshmallow version 3"`
`11`	`10`	`)`