Skip to content

Commit

Permalink
Fix typing issues
Browse files Browse the repository at this point in the history
  • Loading branch information
davidtsuk committed Sep 12, 2024
1 parent e256e2c commit 848cc93
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion snuba/admin/clickhouse/migration_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def __init__(
).get_migrations()

migration_statuses = {}
for migration_id, status, _ in migrations:
for migration_id, status, _, _ in migrations:
migration_statuses[migration_id] = {
"migration_id": migration_id,
"status": status,
Expand Down
2 changes: 1 addition & 1 deletion snuba/admin/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ def migrations_groups_list(group: str) -> Response:
"status": status.value,
"blocking": blocking,
}
for migration_id, status, blocking in runner_group_migrations
for migration_id, status, blocking, _ in runner_group_migrations
]
),
200,
Expand Down
2 changes: 1 addition & 1 deletion snuba/migrations/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ def show_all(
migration_groups = get_active_migration_groups()

migration_status = self._get_migration_status(migration_groups)
clickhouse_group_migrations = {}
clickhouse_group_migrations: MutableMapping[MigrationGroup, List[str]] = {}
for group, migration_id in migration_status.keys():
clickhouse_group_migrations.setdefault(group, []).append(migration_id)

Expand Down
17 changes: 10 additions & 7 deletions tests/admin/clickhouse_migrations/test_migration_checks.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ def group_loader() -> GroupLoader:


RUN_MIGRATIONS: Sequence[MigrationDetails] = [
MigrationDetails("0001", Status.COMPLETED, True),
MigrationDetails("0002", Status.NOT_STARTED, True),
MigrationDetails("0003", Status.NOT_STARTED, True),
MigrationDetails("0001", Status.COMPLETED, True, True),
MigrationDetails("0002", Status.NOT_STARTED, True, True),
MigrationDetails("0003", Status.NOT_STARTED, True, True),
]


Expand Down Expand Up @@ -62,9 +62,9 @@ def test_status_checker_run(


REVERSE_MIGRATIONS: Sequence[MigrationDetails] = [
MigrationDetails("0001", Status.COMPLETED, True),
MigrationDetails("0002", Status.IN_PROGRESS, True),
MigrationDetails("0003", Status.NOT_STARTED, True),
MigrationDetails("0001", Status.COMPLETED, True, True),
MigrationDetails("0002", Status.IN_PROGRESS, True, True),
MigrationDetails("0003", Status.NOT_STARTED, True, True),
]


Expand Down Expand Up @@ -155,7 +155,10 @@ def test_run_migration_checks_and_policies(
mock_policy = Mock()
checker = mock_checker()
mock_runner.show_all.return_value = [
(MigrationGroup("events"), [MigrationDetails("0001", Status.COMPLETED, True)])
(
MigrationGroup("events"),
[MigrationDetails("0001", Status.COMPLETED, True, True)],
)
]

mock_policy.can_run.return_value = policy_result[0]
Expand Down

0 comments on commit 848cc93

Please sign in to comment.