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

78 lines
2.2 KiB
Python

import pytest
from helpers.cluster import ClickHouseCluster
cluster = ClickHouseCluster(__file__)
node = cluster.add_instance(
"node",
)
@pytest.fixture(scope="module", autouse=True)
def start_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
@pytest.fixture(autouse=True)
def drop_after_test():
try:
yield
finally:
node.query("DROP TABLE IF EXISTS tbl SYNC")
node.exec_in_container(["bash", "-c", "rm -fr /var/lib/clickhouse/shadow/"])
# Test that FREEZE operation can be cancelled with KILL QUERY.
def test_cancel_backup():
if node.is_built_with_sanitizer():
pytest.skip("Creating 20K parts under sanitizers can be slow.")
# Freezing so much parts should take at least 2 seconds
parts = 20_000
node.query(
f"CREATE TABLE tbl (x UInt32, y UInt32) ENGINE=MergeTree() PARTITION BY (x%{parts}) ORDER BY x"
)
node.query(
f"INSERT INTO tbl SELECT number, number FROM numbers({parts}) SETTINGS max_partitions_per_insert_block={parts}"
)
uuid = node.query("SELECT uuid FROM system.tables WHERE name='tbl'").strip()
shadow_path = f"/var/lib/clickhouse/shadow/test/store/{uuid[:3]}/{uuid}"
freeze = node.get_query_request("ALTER TABLE tbl FREEZE WITH NAME 'test'")
for _ in range(100):
shadow_dir_exists = (
len(
node.exec_in_container(
["bash", "-c", "ls /var/lib/clickhouse/shadow/"], nothrow=True
)
)
> 0
)
if (
shadow_dir_exists
and node.query(
"SELECT count() FROM system.processes WHERE query_kind == 'Alter' AND query LIKE '%FREEZE%'"
)
== "1\n"
):
node.query(
"KILL QUERY WHERE query_kind == 'Alter' AND query LIKE '%FREEZE%' SYNC"
)
assert "killed in pending state" in freeze.get_error()
assert parts > len(
node.exec_in_container(["bash", "-c", f"ls {shadow_path}"])
.strip()
.split()
)
return
raise RuntimeError("Query has finished before it could be killed")