From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Tue, 29 Mar 2016 21:24:59 +0000 (-0700)
Subject: tests: importorskip migration tests on "migrate" rather than on Python 3
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c451cd0a6a5d4ffa8f4bb7f8446cf362c2db3dd8;p=mediagoblin.git

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.
---

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