mirror of
https://github.com/hanzoai/datastore.git
synced 2026-09-26 13:55:07 +00:00
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]>
63 lines
1.8 KiB
Python
63 lines
1.8 KiB
Python
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
node = cluster.add_instance(
|
|
"node", main_configs=["configs/config.xml"], user_configs=["configs/users.xml"]
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def test_hide_in_preprocessed(started_cluster):
|
|
assert (
|
|
node.query(
|
|
"select value from system.server_settings where name ='max_thread_pool_free_size'"
|
|
)
|
|
== "2000\n"
|
|
)
|
|
assert (
|
|
node.query(
|
|
"select value from system.server_settings where name ='max_table_size_to_drop'"
|
|
)
|
|
== "60000000000\n"
|
|
)
|
|
assert (
|
|
node.query(
|
|
"select value from system.server_settings where name ='max_partition_size_to_drop'"
|
|
)
|
|
== "40000000000\n"
|
|
)
|
|
assert "key_1" in node.query("select collection from system.named_collections")
|
|
out = node.exec_in_container(
|
|
["cat", "/var/lib/clickhouse/preprocessed_configs/config.xml"]
|
|
)
|
|
assert (
|
|
'<max_thread_pool_free_size hide_in_preprocessed="1">2000</max_thread_pool_free_size>'
|
|
not in out
|
|
)
|
|
assert (
|
|
'<max_table_size_to_drop hide_in_preprocessed="true">60000000000</max_table_size_to_drop>'
|
|
not in out
|
|
)
|
|
assert (
|
|
'<max_partition_size_to_drop hide_in_preprocessed="false">40000000000</max_partition_size_to_drop>'
|
|
in out
|
|
)
|
|
assert '<named_collections hide_in_preprocessed="true">' not in out
|
|
|
|
# make sure the preprocessed users.xml was saved (this throws if the file does not exist)
|
|
node.exec_in_container(
|
|
["ls", "/var/lib/clickhouse/preprocessed_configs/users.xml"]
|
|
)
|