Skip to content

Commit

Permalink
chore(tests): Fix MySQL logic (apache#29356)
Browse files Browse the repository at this point in the history
  • Loading branch information
john-bodley authored Jun 25, 2024
1 parent c12b4e9 commit f9f70e3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 15 deletions.
12 changes: 2 additions & 10 deletions tests/integration_tests/celery_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 0 additions & 5 deletions tests/integration_tests/reports/commands_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 (
Expand Down

0 comments on commit f9f70e3

Please sign in to comment.