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

60 lines
1.9 KiB
Python

import pytest
from helpers.cluster import ClickHouseCluster
@pytest.fixture(scope="module")
def started_cluster():
try:
cluster = ClickHouseCluster(__file__)
# Disable `with_remote_database_disk` as the test uses the local disk to store metadata files.
cluster.add_instance(
"dummy",
clickhouse_path_dir="clickhouse_path",
stay_alive=True,
with_remote_database_disk=False,
)
cluster.start()
cluster_fail = ClickHouseCluster(__file__, name="fail")
cluster_fail.add_instance(
"dummy_fail",
clickhouse_path_dir="clickhouse_path_fail",
with_remote_database_disk=False,
)
with pytest.raises(Exception):
cluster_fail.start()
cluster_fail.shutdown() # cleanup
yield cluster
finally:
cluster.shutdown()
def test_sophisticated_default(started_cluster):
instance = started_cluster.instances["dummy"]
instance.query("TRUNCATE TABLE sophisticated_default")
instance.query("INSERT INTO sophisticated_default (c) VALUES (0)")
assert instance.query("SELECT a, b, c FROM sophisticated_default") == "3\t9\t0\n"
def test_partially_dropped_tables(started_cluster):
instance = started_cluster.instances["dummy"]
assert (
instance.exec_in_container(
["bash", "-c", "find /var/lib/clickhouse/*/default -name *.sql* | sort"],
privileged=True,
user="root",
)
== "/var/lib/clickhouse/metadata/default/should_be_restored.sql\n"
"/var/lib/clickhouse/metadata/default/sophisticated_default.sql\n"
)
assert instance.query("SELECT n FROM should_be_restored") == "1\n2\n3\n"
assert (
instance.query(
"SELECT count() FROM system.tables WHERE name='should_be_dropped'"
)
== "0\n"
)