From f736fb3846a5d36b5334b82506bc5c20e95d6000 Mon Sep 17 00:00:00 2001 From: John Bodley Date: Mon, 24 Jun 2024 21:53:22 -0700 Subject: [PATCH] chore(tests): Fix MySQL logic --- 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 3bd82211e5da4..ff98f00cbe12f 100644 --- a/tests/integration_tests/celery_tests.py +++ b/tests/integration_tests/celery_tests.py @@ -256,8 +256,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( @@ -287,10 +287,6 @@ def test_run_async_query_cta_config(test_client, ctas_method): @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices", "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, @@ -318,10 +314,6 @@ def test_run_async_cta_query(test_client, ctas_method): @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices", "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 e4c64a51b91de..3936888b03ffd 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 (