Files
Alexey MilovidovandClaude Opus 4.8 295ced78d1 Enable more Ruff checks (F401/F403/F405/F541/F841) and clean up tests
Follow-up to #105171, which added `ruff` with a deliberately narrow,
bug-class-only rule set and left the unused-name and star-import rules
off pending a dedicated cleanup pass. This enables that second batch in
`pyproject.toml` and fixes every violation across the tree (the bulk in
integration tests):

- `F401` unused-import and `F841` unused-variable: removed, preserving
  any side-effecting right-hand side (e.g. `result = node.query(...)`
  becomes `node.query(...)`). Two `try: import ...` feature probes are
  kept with `# noqa: F401`.
- `F541` f-string-missing-placeholders: dropped the redundant `f` prefix.
- `F403`/`F405` star imports: every `from module import *` is expanded
  into explicit imports of the names actually used, taken from each
  name's real origin, so stdlib/third-party names import from their real
  source rather than through a test "convenience bundle". The now-empty
  `tests/integration/helpers/kafka/common_direct.py` bundle is removed and
  its three remaining consumers import `_VarintBytes`/`KafkaAdminClient`
  directly.

Eliminating the star imports surfaced a real bug the wildcard had masked
from `F821`: `generate_presets.py` in `test_prometheus_protocols` called
an undefined `execute_instant_query_with_http_api`; fixed to the existing
`execute_query_via_http_api`.

No `black`/`isort` reformatting was applied (neither is enforced in the
style check), so the diff is limited to the lint fixes themselves.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
2026-06-18 23:22:25 +00:00

40 lines
1.3 KiB
Python

from helpers.test_tools import assert_eq_with_retry
def _parse_table_database(table, database):
if database is not None:
return table, database
if "." in table:
return reversed(table.split(".", 1))
return table, "default"
def wait_for_delete_inactive_parts(node, table, database=None, **kwargs):
table, database = _parse_table_database(table, database)
inactive_parts_query = (
f"SELECT count() FROM system.parts "
f"WHERE not active AND table = '{table}' AND database = '{database}';"
)
assert_eq_with_retry(node, inactive_parts_query, "0\n", **kwargs)
def wait_for_delete_empty_parts(node, table, database=None, **kwargs):
table, database = _parse_table_database(table, database)
empty_parts_query = (
f"SELECT count() FROM system.parts "
f"WHERE active AND rows = 0 AND table = '{table}' AND database = '{database}'"
)
assert_eq_with_retry(node, empty_parts_query, "0\n", **kwargs)
def wait_for_merges(node, table, database=None, **kwargs):
table, database = _parse_table_database(table, database)
merges_count_query = (
f"SELECT count() > 0 FROM system.merges "
f"WHERE table = '{table}' AND database = '{database}'"
)
assert_eq_with_retry(node, merges_count_query, "1\n", **kwargs)