Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(tests): Fix MySQL logic #29356

Merged
merged 1 commit into from
Jun 25, 2024
+2 −15
Merged

chore(tests): Fix MySQL logic #29356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions tests/integration_tests/celery_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
5 changes: 0 additions & 5 deletions tests/integration_tests/reports/commands_tests.py
View file
Open in desktop
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