Fixing more tests

apache · Mar 24, 2017 · 72614f3 · 72614f3
1 parent 8e4cc7a
commit 72614f3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/superset/dataframe.py b/superset/dataframe.py
@@ -123,6 +123,8 @@ def columns(self):
                     column['type'] = 'FLOAT'
                 elif isinstance(v, (datetime, date)):
                     column['type'] = 'DATETIME'
+                    column['is_date'] = True
+                    column['is_dim'] = False
                 # check if encoded datetime
                 if (
                         column['type'] == 'STRING' and

diff --git a/tests/celery_tests.py b/tests/celery_tests.py
@@ -9,6 +9,7 @@
 import subprocess
 import time
 import unittest
+from past.builtins import basestring
 
 import pandas as pd
 
@@ -280,7 +281,7 @@ def test_get_columns(self):
             )
         else:
             self.assertEqual(self.dictify_list_of_dicts([
-                {'is_date': True, 'type': 'STRING', 'name': 'ds',
+                {'is_date': True, 'type': 'DATETIME', 'name': 'ds',
                     'is_dim': False},
                 {'is_date': True, 'type': 'DATETIME',
                     'name': 'ds2', 'is_dim': False},