aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBerker Peksag <berker.peksag@gmail.com>2014-07-28 13:22:42 +0300
committerBerker Peksag <berker.peksag@gmail.com>2014-07-28 13:22:42 +0300
commit88ed537a9e1d85bb8f86d9a4d1289fb8d50bb073 (patch)
tree1a29f69253396be9a5c47fdc82513e59562e9957
parentfe6f82be237808ba86688a117f32cf2311c2118c (diff)
downloadmediagoblin-88ed537a9e1d85bb8f86d9a4d1289fb8d50bb073.tar.lz
mediagoblin-88ed537a9e1d85bb8f86d9a4d1289fb8d50bb073.tar.xz
mediagoblin-88ed537a9e1d85bb8f86d9a4d1289fb8d50bb073.zip
Skip test_sql_migrations on Python 3 for now.
-rw-r--r--mediagoblin/tests/test_sql_migrations.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/mediagoblin/tests/test_sql_migrations.py b/mediagoblin/tests/test_sql_migrations.py
index e86dcd80..7e0569ad 100644
--- a/mediagoblin/tests/test_sql_migrations.py
+++ b/mediagoblin/tests/test_sql_migrations.py
@@ -14,9 +14,12 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-import copy
-
import six
+import pytest
+
+pytestmark = pytest.mark.skipif(six.PY3, reason='needs sqlalchemy.migrate')
+
+import copy
from sqlalchemy import (
Table, Column, MetaData, Index,
@@ -25,7 +28,8 @@ from sqlalchemy import (
from sqlalchemy.orm import sessionmaker, relationship
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy.sql import select, insert
-from migrate import changeset
+if six.PY2:
+ from migrate import changeset
from mediagoblin.db.base import GMGTableBase
from mediagoblin.db.migration_tools import MigrationManager, RegisterMigration