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]>
58 lines
1.6 KiB
Python
58 lines
1.6 KiB
Python
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
|
|
disk_types = {
|
|
"default": "Local",
|
|
"disk_s3": "S3",
|
|
"disk_encrypted": "S3",
|
|
}
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def cluster():
|
|
try:
|
|
cluster = ClickHouseCluster(__file__)
|
|
cluster.add_instance(
|
|
"node",
|
|
main_configs=["configs/storage.xml", "configs/macros.xml"],
|
|
# Disable with_remote_database_disk to reduce diversion between the public and private repo.
|
|
# So we do not handle the test differently in the private repo
|
|
with_remote_database_disk=False,
|
|
with_minio=True,
|
|
)
|
|
cluster.start()
|
|
yield cluster
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
def test_select_by_type(cluster):
|
|
node = cluster.instances["node"]
|
|
for name, disk_type in list(disk_types.items()):
|
|
if disk_type == "Local":
|
|
assert (
|
|
node.query(
|
|
"SELECT name FROM system.disks WHERE type='" + disk_type + "'"
|
|
)
|
|
== name + "\n"
|
|
)
|
|
elif disk_type == "S3":
|
|
assert (
|
|
node.query(
|
|
"SELECT name FROM system.disks WHERE object_storage_type='"
|
|
+ disk_type
|
|
+ "' ORDER BY name"
|
|
)
|
|
== "disk_encrypted\ndisk_s3\n"
|
|
)
|
|
else:
|
|
assert (
|
|
node.query(
|
|
"SELECT name FROM system.disks WHERE object_storage_type='"
|
|
+ disk_type
|
|
+ "'"
|
|
)
|
|
== name + "\n"
|
|
)
|