aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/tests
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2016-03-29 14:24:59 -0700
committerChristopher Allan Webber <cwebber@dustycloud.org>2016-03-29 14:27:07 -0700
commitc451cd0a6a5d4ffa8f4bb7f8446cf362c2db3dd8 (patch)
tree4c9495a839e37e3b3c7190385ebd5cd4026cab50 /mediagoblin/tests
parentfbca3074f70e2ee1acd3684339798375a40e5483 (diff)
downloadmediagoblin-c451cd0a6a5d4ffa8f4bb7f8446cf362c2db3dd8.tar.lz
mediagoblin-c451cd0a6a5d4ffa8f4bb7f8446cf362c2db3dd8.tar.xz
mediagoblin-c451cd0a6a5d4ffa8f4bb7f8446cf362c2db3dd8.zip
tests: importorskip migration tests on "migrate" rather than on Python 3
Previously we assumed we wouldn't run migration tests if we're on Python 3, but now that we support sqlalchemy-migrate with Python 3, switch to checking based on "migrate" importability. * mediagoblin/tests/test_sql_migrations.py: Update test skipping to rely on "migrate" module presence rather than Python 3 check.
Diffstat (limited to 'mediagoblin/tests')
-rw-r--r--mediagoblin/tests/test_sql_migrations.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py
index 7e0569ad..4bdadf1b 100644
--- a/mediagoblin/tests/test_sql_migrations.py
+++ b/mediagoblin/tests/test_sql_migrations.py
@@ -17,7 +17,7 @@
import six
import pytest
-pytestmark = pytest.mark.skipif(six.PY3, reason='needs sqlalchemy.migrate')
+pytest.importorskip("migrate")
import copy