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]>
39 lines
1.4 KiB
Python
39 lines
1.4 KiB
Python
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
|
|
def test_yaml_merge_keys_conf():
|
|
cluster = ClickHouseCluster(__file__)
|
|
node = cluster.add_instance("node", user_configs=["configs/merge_keys.yml"])
|
|
|
|
try:
|
|
cluster.start()
|
|
|
|
# Assert simple merge key substitution
|
|
assert node.query("select getSetting('max_threads')", user="user_1") == "1\n"
|
|
|
|
# Assert merge key overriden by regular key
|
|
assert node.query("select getSetting('max_threads')", user="user_2") == "4\n"
|
|
|
|
# Assert normal key overriden by merge key
|
|
assert node.query("select getSetting('max_threads')", user="user_3") == "4\n"
|
|
|
|
# Assert override with multiple merge keys
|
|
assert (
|
|
node.query("select getSetting('max_final_threads')", user="user_4") == "2\n"
|
|
)
|
|
|
|
# Assert multiple merge key substitutions overriden by regular key
|
|
assert node.query("select getSetting('max_threads')", user="user_4") == "4\n"
|
|
|
|
# Assert override with multiple merge keys for list syntax
|
|
assert (
|
|
node.query("select getSetting('max_final_threads')", user="user_5") == "2\n"
|
|
)
|
|
|
|
# Assert multiple merge key substitutions overriden by regular key
|
|
# for list syntax
|
|
assert node.query("select getSetting('max_threads')", user="user_5") == "4\n"
|
|
finally:
|
|
cluster.shutdown()
|