[format] Using Black (#7769)

This commit is contained in:
John Bodley
2019-06-25 13:34:48 -07:00
committed by GitHub
parent 0c9e6d0985
commit 5c58fd1802
270 changed files with 15592 additions and 14772 deletions

View File

@@ -20,12 +20,7 @@ from unittest.mock import MagicMock
from superset import db
from superset.models.core import Log
from superset.models.tags import (
get_tag,
ObjectTypes,
TaggedObject,
TagTypes,
)
from superset.models.tags import get_tag, ObjectTypes, TaggedObject, TagTypes
from superset.tasks.cache import (
DashboardTagsStrategy,
DummyStrategy,
@@ -35,18 +30,17 @@ from superset.tasks.cache import (
from .base_tests import SupersetTestCase
TEST_URL = 'http://0.0.0.0:8081/superset/explore_json'
TEST_URL = "http://0.0.0.0:8081/superset/explore_json"
class CacheWarmUpTests(SupersetTestCase):
def __init__(self, *args, **kwargs):
super(CacheWarmUpTests, self).__init__(*args, **kwargs)
def test_get_form_data_chart_only(self):
chart_id = 1
result = get_form_data(chart_id, None)
expected = {'slice_id': chart_id}
expected = {"slice_id": chart_id}
self.assertEqual(result, expected)
def test_get_form_data_no_dashboard_metadata(self):
@@ -54,21 +48,23 @@ class CacheWarmUpTests(SupersetTestCase):
dashboard = MagicMock()
dashboard.json_metadata = None
result = get_form_data(chart_id, dashboard)
expected = {'slice_id': chart_id}
expected = {"slice_id": chart_id}
self.assertEqual(result, expected)
def test_get_form_data_immune_slice(self):
chart_id = 1
filter_box_id = 2
dashboard = MagicMock()
dashboard.json_metadata = json.dumps({
'filter_immune_slices': [chart_id],
'default_filters': json.dumps({
str(filter_box_id): {'name': ['Alice', 'Bob']},
}),
})
dashboard.json_metadata = json.dumps(
{
"filter_immune_slices": [chart_id],
"default_filters": json.dumps(
{str(filter_box_id): {"name": ["Alice", "Bob"]}}
),
}
)
result = get_form_data(chart_id, dashboard)
expected = {'slice_id': chart_id}
expected = {"slice_id": chart_id}
self.assertEqual(result, expected)
def test_get_form_data_no_default_filters(self):
@@ -76,32 +72,30 @@ class CacheWarmUpTests(SupersetTestCase):
dashboard = MagicMock()
dashboard.json_metadata = json.dumps({})
result = get_form_data(chart_id, dashboard)
expected = {'slice_id': chart_id}
expected = {"slice_id": chart_id}
self.assertEqual(result, expected)
def test_get_form_data_immune_fields(self):
chart_id = 1
filter_box_id = 2
dashboard = MagicMock()
dashboard.json_metadata = json.dumps({
'default_filters': json.dumps({
str(filter_box_id): {
'name': ['Alice', 'Bob'],
'__time_range': '100 years ago : today',
},
}),
'filter_immune_slice_fields': {chart_id: ['__time_range']},
})
dashboard.json_metadata = json.dumps(
{
"default_filters": json.dumps(
{
str(filter_box_id): {
"name": ["Alice", "Bob"],
"__time_range": "100 years ago : today",
}
}
),
"filter_immune_slice_fields": {chart_id: ["__time_range"]},
}
)
result = get_form_data(chart_id, dashboard)
expected = {
'slice_id': chart_id,
'extra_filters': [
{
'col': 'name',
'op': 'in',
'val': ['Alice', 'Bob'],
},
],
"slice_id": chart_id,
"extra_filters": [{"col": "name", "op": "in", "val": ["Alice", "Bob"]}],
}
self.assertEqual(result, expected)
@@ -109,44 +103,40 @@ class CacheWarmUpTests(SupersetTestCase):
chart_id = 1
filter_box_id = 2
dashboard = MagicMock()
dashboard.json_metadata = json.dumps({
'default_filters': json.dumps({
str(filter_box_id): {
'__time_range': '100 years ago : today',
},
}),
'filter_immune_slice_fields': {chart_id: ['__time_range']},
})
dashboard.json_metadata = json.dumps(
{
"default_filters": json.dumps(
{str(filter_box_id): {"__time_range": "100 years ago : today"}}
),
"filter_immune_slice_fields": {chart_id: ["__time_range"]},
}
)
result = get_form_data(chart_id, dashboard)
expected = {'slice_id': chart_id}
expected = {"slice_id": chart_id}
self.assertEqual(result, expected)
def test_get_form_data(self):
chart_id = 1
filter_box_id = 2
dashboard = MagicMock()
dashboard.json_metadata = json.dumps({
'default_filters': json.dumps({
str(filter_box_id): {
'name': ['Alice', 'Bob'],
'__time_range': '100 years ago : today',
},
}),
})
dashboard.json_metadata = json.dumps(
{
"default_filters": json.dumps(
{
str(filter_box_id): {
"name": ["Alice", "Bob"],
"__time_range": "100 years ago : today",
}
}
)
}
)
result = get_form_data(chart_id, dashboard)
expected = {
'slice_id': chart_id,
'extra_filters': [
{
'col': 'name',
'op': 'in',
'val': ['Alice', 'Bob'],
},
{
'col': '__time_range',
'op': 'in',
'val': '100 years ago : today',
},
"slice_id": chart_id,
"extra_filters": [
{"col": "name", "op": "in", "val": ["Alice", "Bob"]},
{"col": "__time_range", "op": "in", "val": "100 years ago : today"},
],
}
self.assertEqual(result, expected)
@@ -155,82 +145,72 @@ class CacheWarmUpTests(SupersetTestCase):
strategy = DummyStrategy()
result = sorted(strategy.get_urls())
expected = [
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+1%7D',
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+17%7D',
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+18%7D',
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+19%7D',
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+30%7D',
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D',
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+8%7D',
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+1%7D",
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+17%7D",
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+18%7D",
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+19%7D",
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+30%7D",
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D",
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+8%7D",
]
self.assertEqual(result, expected)
def test_top_n_dashboards_strategy(self):
# create a top visited dashboard
db.session.query(Log).delete()
self.login(username='admin')
self.login(username="admin")
for _ in range(10):
self.client.get('/superset/dashboard/3/')
self.client.get("/superset/dashboard/3/")
strategy = TopNDashboardsStrategy(1)
result = sorted(strategy.get_urls())
expected = [
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D',
]
expected = [f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D"]
self.assertEqual(result, expected)
def test_dashboard_tags(self):
strategy = DashboardTagsStrategy(['tag1'])
strategy = DashboardTagsStrategy(["tag1"])
result = sorted(strategy.get_urls())
expected = []
self.assertEqual(result, expected)
# tag dashboard 3 with `tag1`
tag1 = get_tag('tag1', db.session, TagTypes.custom)
tag1 = get_tag("tag1", db.session, TagTypes.custom)
object_id = 3
tagged_object = TaggedObject(
tag_id=tag1.id,
object_id=object_id,
object_type=ObjectTypes.dashboard,
tag_id=tag1.id, object_id=object_id, object_type=ObjectTypes.dashboard
)
db.session.add(tagged_object)
db.session.commit()
result = sorted(strategy.get_urls())
expected = [
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D',
]
expected = [f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D"]
self.assertEqual(result, expected)
strategy = DashboardTagsStrategy(['tag2'])
strategy = DashboardTagsStrategy(["tag2"])
result = sorted(strategy.get_urls())
expected = []
self.assertEqual(result, expected)
# tag chart 30 with `tag2`
tag2 = get_tag('tag2', db.session, TagTypes.custom)
tag2 = get_tag("tag2", db.session, TagTypes.custom)
object_id = 30
tagged_object = TaggedObject(
tag_id=tag2.id,
object_id=object_id,
object_type=ObjectTypes.chart,
tag_id=tag2.id, object_id=object_id, object_type=ObjectTypes.chart
)
db.session.add(tagged_object)
db.session.commit()
result = sorted(strategy.get_urls())
expected = [
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+30%7D',
]
expected = [f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+30%7D"]
self.assertEqual(result, expected)
strategy = DashboardTagsStrategy(['tag1', 'tag2'])
strategy = DashboardTagsStrategy(["tag1", "tag2"])
result = sorted(strategy.get_urls())
expected = [
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+30%7D',
f'{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D',
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+30%7D",
f"{TEST_URL}/?form_data=%7B%27slice_id%27%3A+31%7D",
]
self.assertEqual(result, expected)