Added mapd.conf to allow some string operations.

ibis-project · May 16, 2018 · 8656128 · 8656128
1 parent 1e5c0e7
commit 8656128
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
@@ -59,6 +59,8 @@ services:
       - MAPD_PORT=9091
       - MAPD_DATABASE=ibis_testing
       - MAPD_USER=mapd
+    volumes:
+      - ./mapd.conf:/mapd-storage/mapd.conf
 
   waiter:
     image: jwilder/dockerize

diff --git a/ci/mapd.conf b/ci/mapd.conf
@@ -0,0 +1 @@
+enable-watchdog = false
diff --git a/ibis/tests/all/conftest.py b/ibis/tests/all/conftest.py
@@ -25,16 +25,16 @@ def data_directory():
 
 
 @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(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)
+    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')
 def backend(request, data_directory):
     return request.param(data_directory)