mirror of https://github.com/apache/superset.git
Fixing the tests for py3
This commit is contained in:
parent
60bce9ed59
commit
8e27099866
|
@ -5,7 +5,8 @@ babel
|
||||||
_build
|
_build
|
||||||
_static
|
_static
|
||||||
caravel/bin/caravelc
|
caravel/bin/caravelc
|
||||||
envpy3
|
env_py3
|
||||||
|
.eggs
|
||||||
build
|
build
|
||||||
*.db
|
*.db
|
||||||
tmp
|
tmp
|
||||||
|
|
|
@ -38,7 +38,7 @@ class SelectMultipleSortableField(SelectMultipleField):
|
||||||
if value:
|
if value:
|
||||||
yield d.pop(value)
|
yield d.pop(value)
|
||||||
while d:
|
while d:
|
||||||
yield d.pop(d.keys()[0])
|
yield d.popitem(last=False)[1]
|
||||||
|
|
||||||
|
|
||||||
class FreeFormSelect(widgets.Select):
|
class FreeFormSelect(widgets.Select):
|
||||||
|
@ -82,6 +82,7 @@ class OmgWtForm(Form):
|
||||||
return getattr(self, fieldname)
|
return getattr(self, fieldname)
|
||||||
|
|
||||||
def field_css_classes(self, fieldname):
|
def field_css_classes(self, fieldname):
|
||||||
|
print(fieldname, self.css_classes[fieldname])
|
||||||
if fieldname in self.css_classes:
|
if fieldname in self.css_classes:
|
||||||
return " ".join(self.css_classes[fieldname])
|
return " ".join(self.css_classes[fieldname])
|
||||||
return ""
|
return ""
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
{% for fieldname in fieldset.fields %}
|
{% for fieldname in fieldset.fields %}
|
||||||
{% if not fieldname %}
|
{% if not fieldname %}
|
||||||
<hr/>
|
<hr/>
|
||||||
{% elif not fieldname.__iter__ %}
|
{% elif fieldname is string %}
|
||||||
{{ panofield(fieldname) }}
|
{{ panofield(fieldname) }}
|
||||||
{% else %}
|
{% else %}
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
|
|
@ -467,8 +467,9 @@ class Caravel(BaseView):
|
||||||
else:
|
else:
|
||||||
template = "caravel/explore.html"
|
template = "caravel/explore.html"
|
||||||
|
|
||||||
try:
|
|
||||||
resp = self.render_template(template, viz=obj, slice=slc)
|
resp = self.render_template(template, viz=obj, slice=slc)
|
||||||
|
try:
|
||||||
|
pass
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
if config.get("DEBUG"):
|
if config.get("DEBUG"):
|
||||||
raise(e)
|
raise(e)
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -19,6 +19,7 @@ setup(
|
||||||
'flask-cache>=0.13.1, <0.14.0',
|
'flask-cache>=0.13.1, <0.14.0',
|
||||||
'flask-migrate>=1.5.1, <2.0.0',
|
'flask-migrate>=1.5.1, <2.0.0',
|
||||||
'flask-script>=2.0.5, <3.0.0',
|
'flask-script>=2.0.5, <3.0.0',
|
||||||
|
'flask-sqlalchemy==2.0.0',
|
||||||
'flask-testing>=0.4.2, <0.5.0',
|
'flask-testing>=0.4.2, <0.5.0',
|
||||||
'flask>=0.10.1, <1.0.0',
|
'flask>=0.10.1, <1.0.0',
|
||||||
'humanize>=0.5.1, <0.6.0',
|
'humanize>=0.5.1, <0.6.0',
|
||||||
|
|
|
@ -70,7 +70,7 @@ class CaravelTests(unittest.TestCase):
|
||||||
urls[dash.dashboard_title] = dash.url
|
urls[dash.dashboard_title] = dash.url
|
||||||
for title, url in urls.items():
|
for title, url in urls.items():
|
||||||
print(url)
|
print(url)
|
||||||
assert escape(title) in self.client.get(url).data
|
assert escape(title) in self.client.get(url).data.decode('utf-8')
|
||||||
|
|
||||||
def test_doctests(self):
|
def test_doctests(self):
|
||||||
modules = [utils]
|
modules = [utils]
|
||||||
|
@ -80,8 +80,8 @@ class CaravelTests(unittest.TestCase):
|
||||||
raise Exception("Failed a doctest")
|
raise Exception("Failed a doctest")
|
||||||
|
|
||||||
def test_misc(self):
|
def test_misc(self):
|
||||||
assert self.client.get('/health').data == "OK"
|
assert self.client.get('/health').data.decode('utf-8') == "OK"
|
||||||
assert self.client.get('/ping').data == "OK"
|
assert self.client.get('/ping').data.decode('utf-8') == "OK"
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
Loading…
Reference in New Issue