pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(tests): Remove unnecessary explicit Flask-SQLAlchemy session expunges (#27136)

This commit is contained in:
John Bodley 2024-02-17 07:05:22 +13:00 committed by GitHub
parent dab44c0b6f
commit 8749d9f386
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/integration_tests/base_tests.py
View File

@ -199,11 +199,8 @@ class SupersetTestCase(TestCase):
def login(self, username="admin", password="general"): def login(self, username="admin", password="general"):
return login(self.client, username, password) return login(self.client, username, password)
def get_slice(self, slice_name: str, expunge_from_session: bool = True) -> Slice: def get_slice(self, slice_name: str) -> Slice:
slc = db.session.query(Slice).filter_by(slice_name=slice_name).one() return db.session.query(Slice).filter_by(slice_name=slice_name).one()
if expunge_from_session:
db.session.expunge_all()
return slc
@staticmethod @staticmethod
def get_table( def get_table(

7
tests/integration_tests/core_tests.py
View File

@ -199,7 +199,6 @@ class TestCore(SupersetTestCase):
url.format(tbl_id, copy_name, "saveas"), url.format(tbl_id, copy_name, "saveas"),
data={"form_data": json.dumps(form_data)}, data={"form_data": json.dumps(form_data)},
) )
db.session.expunge_all()
new_slice_id = resp.json["form_data"]["slice_id"] new_slice_id = resp.json["form_data"]["slice_id"]
slc = db.session.query(Slice).filter_by(id=new_slice_id).one() slc = db.session.query(Slice).filter_by(id=new_slice_id).one()
@ -221,7 +220,6 @@ class TestCore(SupersetTestCase):
url.format(tbl_id, new_slice_name, "overwrite"), url.format(tbl_id, new_slice_name, "overwrite"),
data={"form_data": json.dumps(form_data)}, data={"form_data": json.dumps(form_data)},
) )
db.session.expunge_all()
slc = db.session.query(Slice).filter_by(id=new_slice_id).one() slc = db.session.query(Slice).filter_by(id=new_slice_id).one()
self.assertEqual(slc.slice_name, new_slice_name) self.assertEqual(slc.slice_name, new_slice_name)
self.assertEqual(slc.viz.form_data, form_data) self.assertEqual(slc.viz.form_data, form_data)
@ -240,10 +238,7 @@ class TestCore(SupersetTestCase):
def test_slice_data(self): def test_slice_data(self):
# slice data should have some required attributes # slice data should have some required attributes
self.login(username="admin") self.login(username="admin")
slc = self.get_slice( slc = self.get_slice(slice_name="Top 10 Girl Name Share")
slice_name="Top 10 Girl Name Share",
expunge_from_session=False,
)
slc_data_attributes = slc.data.keys() slc_data_attributes = slc.data.keys()
assert "changed_on" in slc_data_attributes assert "changed_on" in slc_data_attributes
assert "modified" in slc_data_attributes assert "modified" in slc_data_attributes

4
tests/integration_tests/security/guest_token_security_tests.py
View File

@ -257,9 +257,9 @@ class TestGuestUserDatasourceAccess(SupersetTestCase):
], ],
} }
) )
self.chart = self.get_slice("Girls", expunge_from_session=False) self.chart = self.get_slice("Girls")
self.datasource = self.chart.datasource self.datasource = self.chart.datasource
self.other_chart = self.get_slice("Treemap", expunge_from_session=False) self.other_chart = self.get_slice("Treemap")
self.other_datasource = self.other_chart.datasource self.other_datasource = self.other_chart.datasource
self.native_filter_datasource = ( self.native_filter_datasource = (
db.session.query(SqlaTable).filter_by(table_name="dummy_sql_table").first() db.session.query(SqlaTable).filter_by(table_name="dummy_sql_table").first()

6
tests/integration_tests/security_tests.py
View File

@ -1722,11 +1722,11 @@ class TestSecurityManager(SupersetTestCase):
mock_is_owner, mock_is_owner,
): ):
births = self.get_dash_by_slug("births") births = self.get_dash_by_slug("births")
girls = self.get_slice("Girls", expunge_from_session=False) girls = self.get_slice("Girls")
birth_names = girls.datasource birth_names = girls.datasource
world_health = self.get_dash_by_slug("world_health") world_health = self.get_dash_by_slug("world_health")
treemap = self.get_slice("Treemap", expunge_from_session=False) treemap = self.get_slice("Treemap")
births.json_metadata = json.dumps( births.json_metadata = json.dumps(
{ {
@ -1872,8 +1872,6 @@ class TestSecurityManager(SupersetTestCase):
} }
) )
db.session.expunge_all()
def test_get_user_roles(self): def test_get_user_roles(self):
admin = security_manager.find_user("admin") admin = security_manager.find_user("admin")
with override_user(admin): with override_user(admin):