Skip to content

Commit

Permalink
Merge pull request #51 from xmnlab/master
Browse files Browse the repository at this point in the history
Just add mapd backend to test when python == 3.
  • Loading branch information
xmnlab committed May 31, 2018
2 parents 60401eb + 5927f25 commit ecbdb5a
Showing 1 changed file with 17 additions and 12 deletions.
29 changes: 17 additions & 12 deletions ibis/tests/all/conftest.py
@@ -1,4 +1,5 @@
import os
import sys
import pytest

from ibis.compat import Path
Expand All @@ -9,6 +10,21 @@

pytestmark = pytest.mark.backend

params_backend = [
pytest.param(Csv, marks=pytest.mark.csv),
pytest.param(Parquet, marks=pytest.mark.parquet),
pytest.param(Pandas, marks=pytest.mark.pandas),
pytest.param(SQLite, marks=pytest.mark.sqlite),
pytest.param(Postgres, marks=pytest.mark.postgres),
pytest.param(MySQL, marks=pytest.mark.mysql),
pytest.param(Clickhouse, marks=pytest.mark.clickhouse),
pytest.param(BigQuery, marks=pytest.mark.bigquery),
pytest.param(Impala, marks=pytest.mark.impala)
]

if sys.version_info[0] == 3:
params_backend.append(pytest.param(MapD, marks=pytest.mark.mapd))


@pytest.fixture(scope='session')
def data_directory():
Expand All @@ -24,18 +40,7 @@ def data_directory():
return datadir


@pytest.fixture(params=[
pytest.param(Csv, marks=pytest.mark.csv),
pytest.param(Parquet, marks=pytest.mark.parquet),
pytest.param(Pandas, marks=pytest.mark.pandas),
pytest.param(SQLite, marks=pytest.mark.sqlite),
pytest.param(Postgres, marks=pytest.mark.postgres),
pytest.param(MapD, marks=pytest.mark.mapd),
pytest.param(MySQL, marks=pytest.mark.mysql),
pytest.param(Clickhouse, marks=pytest.mark.clickhouse),
pytest.param(BigQuery, marks=pytest.mark.bigquery),
pytest.param(Impala, marks=pytest.mark.impala)
], scope='session')
@pytest.fixture(params=params_backend, scope='session')
def backend(request, data_directory):
return request.param(data_directory)

Expand Down

0 comments on commit ecbdb5a

Please sign in to comment.