From f9f70e3e55600b247d1bd5ea1bf9b0832b022566 Mon Sep 17 00:00:00 2001
From: John Bodley <4567245+john-bodley@users.noreply.github.com>
Date: Tue, 25 Jun 2024 10:20:04 -0700
Subject: [PATCH] chore(tests): Fix MySQL logic (#29356)

---
 tests/integration_tests/celery_tests.py           | 12 ++----------
 tests/integration_tests/reports/commands_tests.py |  5 -----
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/tests/integration_tests/celery_tests.py b/tests/integration_tests/celery_tests.py
index a6b840201f..53690443d5 100644
--- a/tests/integration_tests/celery_tests.py
+++ b/tests/integration_tests/celery_tests.py
@@ -255,8 +255,8 @@ def test_run_sync_query_cta_config(test_client, ctas_method):
     lambda d, u, s, sql: CTAS_SCHEMA_NAME,
 )
 def test_run_async_query_cta_config(test_client, ctas_method):
-    if backend() in {"sqlite", "mysql"}:
-        # sqlite doesn't support schemas, mysql is flaky
+    if backend() == "sqlite":
+        # sqlite doesn't support schemas
         return
     tmp_table_name = f"{TEST_ASYNC_CTA_CONFIG}_{ctas_method.lower()}"
     result = run_sql(
@@ -286,10 +286,6 @@ def test_run_async_query_cta_config(test_client, ctas_method):
 @pytest.mark.usefixtures("load_birth_names_data", "login_as_admin")
 @pytest.mark.parametrize("ctas_method", [CtasMethod.TABLE, CtasMethod.VIEW])
 def test_run_async_cta_query(test_client, ctas_method):
-    if backend() == "mysql":
-        # failing
-        return
-
     table_name = f"{TEST_ASYNC_CTA}_{ctas_method.lower()}"
     result = run_sql(
         test_client,
@@ -317,10 +313,6 @@ def test_run_async_cta_query(test_client, ctas_method):
 @pytest.mark.usefixtures("load_birth_names_data", "login_as_admin")
 @pytest.mark.parametrize("ctas_method", [CtasMethod.TABLE, CtasMethod.VIEW])
 def test_run_async_cta_query_with_lower_limit(test_client, ctas_method):
-    if backend() == "mysql":
-        # failing
-        return
-
     tmp_table = f"{TEST_ASYNC_LOWER_LIMIT}_{ctas_method.lower()}"
     result = run_sql(
         test_client,
diff --git a/tests/integration_tests/reports/commands_tests.py b/tests/integration_tests/reports/commands_tests.py
index e4c64a51b9..3936888b03 100644
--- a/tests/integration_tests/reports/commands_tests.py
+++ b/tests/integration_tests/reports/commands_tests.py
@@ -1548,8 +1548,6 @@ def test_report_schedule_working_timeout(create_report_slack_chart_working):
                 datetime.utcnow(),
             ).run()
 
-    # Only needed for MySQL, understand why
-    db.session.commit()
     logs = db.session.query(ReportExecutionLog).all()
     # Two logs, first is created by fixture
     assert len(logs) == 2
@@ -2076,9 +2074,6 @@ def test_grace_period_error(email_mock, create_invalid_sql_alert_email_chart):
                 datetime.utcnow(),
             ).run()
 
-        # Only needed for MySQL, understand why
-        db.session.commit()
-
         # Assert the email smtp address, asserts a notification was sent with the error
         assert email_mock.call_args[0][0] == DEFAULT_OWNER_EMAIL
         assert (