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

67 lines
1.8 KiB
Python

#!/usr/bin/env python3
import pytest
from helpers.cluster import ClickHouseCluster
from helpers.test_tools import assert_logs_contain_with_retry
cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance("node1", with_zookeeper=True, stay_alive=True)
@pytest.fixture(scope="module")
def start_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
def test_old_dirs_cleanup(start_cluster):
node1.query("DROP TABLE IF EXISTS test_table SYNC")
node1.query(
"""
CREATE TABLE test_table(date Date, id UInt32, dummy UInt32)
ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_table', 'node1')
PARTITION BY date ORDER BY id
SETTINGS cleanup_delay_period=3600, max_cleanup_delay_period=3600
"""
)
node1.query("INSERT INTO test_table VALUES (toDate('2020-01-01'), 1, 10)")
assert node1.query("SELECT count() FROM test_table") == "1\n"
data_path = node1.query(
"SELECT arrayElement(data_paths, 1) FROM system.tables WHERE database='default' AND name='test_table'"
).strip()
node1.stop_clickhouse()
node1.exec_in_container(
[
"bash",
"-c",
f"mv {data_path}/20200101_0_0_0 {data_path}/delete_tmp_20200101_0_0_0",
],
privileged=True,
)
node1.start_clickhouse()
assert_logs_contain_with_retry(node1, "Removing temporary directory .*delete_tmp_20200101_0_0_0")
assert_logs_contain_with_retry(node1, "Created empty part 20200101_0_0_0 instead of lost part")
# Replaced empty part
result = node1.exec_in_container(
["bash", "-c", f"ls {data_path}/"],
privileged=True,
)
assert "20200101_0_0_0" in result
assert node1.query("SELECT count() FROM test_table") == "0\n"
node1.query("DROP TABLE test_table SYNC")