mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
Alexey MilovidovandClaude Opus 4.8
295ced78d1
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]>
83 lines
1.9 KiB
Python
83 lines
1.9 KiB
Python
#!/usr/bin/env python3
|
|
|
|
import pytest
|
|
|
|
import helpers.keeper_utils as keeper_utils
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
from kazoo.security import make_digest_acl
|
|
from kazoo.exceptions import NoAuthError
|
|
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
node = cluster.add_instance(
|
|
"node",
|
|
main_configs=["configs/enable_keeper1.xml", "configs/check_node_acl_on_remove.xml"],
|
|
stay_alive=True,
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def wait_nodes():
|
|
keeper_utils.wait_nodes(cluster, [node])
|
|
|
|
|
|
def get_fake_zk(nodename, timeout=30.0):
|
|
return keeper_utils.get_fake_zk(cluster, nodename, timeout=timeout)
|
|
|
|
|
|
def stop_zk_connection(zk_conn):
|
|
zk_conn.stop()
|
|
zk_conn.close()
|
|
|
|
|
|
def test_server_restart(started_cluster):
|
|
wait_nodes()
|
|
|
|
node.stop_clickhouse()
|
|
node.replace_in_config(
|
|
"/etc/clickhouse-server/config.d/check_node_acl_on_remove.xml", "1", "0"
|
|
)
|
|
node.start_clickhouse()
|
|
|
|
def create_node_with_acl():
|
|
node_zk = get_fake_zk("node")
|
|
node_zk.add_auth("digest", "clickhouse:password")
|
|
|
|
if node_zk.exists("/test_acl_node"):
|
|
node_zk.delete("/test_acl_node")
|
|
|
|
acl = make_digest_acl("clickhouse", "password", all=True)
|
|
node_zk.create("/test_acl_node", b"test_data", acl=[acl])
|
|
stop_zk_connection(node_zk)
|
|
|
|
def delete_node():
|
|
node_zk = get_fake_zk("node")
|
|
try:
|
|
node_zk.delete("/test_acl_node")
|
|
finally:
|
|
stop_zk_connection(node_zk)
|
|
|
|
create_node_with_acl()
|
|
delete_node()
|
|
node.stop_clickhouse()
|
|
node.replace_in_config(
|
|
"/etc/clickhouse-server/config.d/check_node_acl_on_remove.xml", "0", "1"
|
|
)
|
|
node.start_clickhouse()
|
|
|
|
create_node_with_acl()
|
|
|
|
with pytest.raises(NoAuthError):
|
|
delete_node()
|