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

101 lines
2.7 KiB
Python

import pytest
from helpers.cluster import ClickHouseCluster, QueryRuntimeException
cluster = ClickHouseCluster(__file__)
node1 = cluster.add_instance(
"node1",
main_configs=["configs/remote_servers.xml"],
with_zookeeper=True,
macros={"shard": 1, "replica": 1},
)
node2 = cluster.add_instance(
"node2",
main_configs=["configs/remote_servers.xml"],
with_zookeeper=True,
macros={"shard": 1, "replica": 2},
)
@pytest.fixture(scope="module")
def started_cluster():
try:
cluster.start()
yield cluster
finally:
cluster.shutdown()
def create_database(node, db_name: str, engine: str, comment: str):
if engine == "Atomic":
node.query(
f"CREATE DATABASE {db_name} ON CLUSTER test_cluster ENGINE = Atomic COMMENT '{comment}'"
)
return
if engine == "Memory":
node.query(
f"CREATE DATABASE {db_name} ON CLUSTER test_cluster ENGINE = Memory COMMENT '{comment}'"
)
return
if engine == "Replicated":
node.query(
f"CREATE DATABASE {db_name} ON CLUSTER test_cluster "
+ r"ENGINE = Replicated('/db/test', '{shard}', '{replica}')"
+ f" COMMENT '{comment}'"
)
return
raise QueryRuntimeException(f"Not supported engine {engine}")
@pytest.mark.parametrize("engine", ["Atomic", "Memory", "Replicated"])
def test_alter_database_comment(started_cluster, engine):
node1.query("DROP DATABASE IF EXISTS test")
node2.query("DROP DATABASE IF EXISTS test")
create_database(node1, "test", engine, "initial comment")
modified_comment = "modified comment"
node1.query(
f"ALTER DATABASE test ON CLUSTER test_cluster (MODIFY COMMENT '{modified_comment}')"
)
assert (
node1.query("SELECT comment FROM system.databases WHERE name='test'").strip()
== modified_comment
)
assert (
node2.query("SELECT comment FROM system.databases WHERE name='test'").strip()
== modified_comment
)
node1.query("DETACH DATABASE test ON CLUSTER test_cluster")
assert (
node1.query("SELECT count() FROM system.databases WHERE name='test'").strip()
== "0"
)
assert (
node2.query("SELECT count() FROM system.databases WHERE name='test'").strip()
== "0"
)
node1.query("ATTACH DATABASE test ON CLUSTER test_cluster")
assert (
node1.query("SELECT comment FROM system.databases WHERE name='test'").strip()
== modified_comment
)
assert (
node2.query("SELECT comment FROM system.databases WHERE name='test'").strip()
== modified_comment
)
node1.query("DROP DATABASE IF EXISTS test")
node2.query("DROP DATABASE IF EXISTS test")