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]>
80 lines
2.5 KiB
Python
80 lines
2.5 KiB
Python
import contextlib
|
|
|
|
import pymysql.cursors
|
|
import pytest
|
|
|
|
from helpers.cluster import ClickHouseCluster
|
|
from helpers.network import PartitionManager
|
|
from helpers.config_cluster import mysql_pass
|
|
|
|
cluster = ClickHouseCluster(__file__)
|
|
clickhouse_node = cluster.add_instance(
|
|
"node1", main_configs=["configs/remote_servers.xml"], with_mysql8=True
|
|
)
|
|
|
|
|
|
@pytest.fixture(scope="module")
|
|
def started_cluster():
|
|
try:
|
|
cluster.start()
|
|
yield cluster
|
|
finally:
|
|
cluster.shutdown()
|
|
|
|
|
|
class MySQLNodeInstance:
|
|
def __init__(self, started_cluster, user="root", password=mysql_pass):
|
|
self.user = user
|
|
self.port = cluster.mysql8_port
|
|
self.hostname = cluster.mysql8_ip
|
|
self.password = password
|
|
self.mysql_connection = None # lazy init
|
|
|
|
def alloc_connection(self):
|
|
if self.mysql_connection is None:
|
|
self.mysql_connection = pymysql.connect(
|
|
user=self.user,
|
|
password=self.password,
|
|
host=self.hostname,
|
|
port=self.port,
|
|
autocommit=True,
|
|
)
|
|
return self.mysql_connection
|
|
|
|
def query(self, execution_query):
|
|
with self.alloc_connection().cursor() as cursor:
|
|
cursor.execute(execution_query)
|
|
|
|
def close(self):
|
|
if self.mysql_connection is not None:
|
|
self.mysql_connection.close()
|
|
|
|
|
|
def test_disabled_mysql_server(started_cluster):
|
|
with contextlib.closing(MySQLNodeInstance(started_cluster)) as mysql_node:
|
|
mysql_node.query("DROP DATABASE IF EXISTS test_db_disabled;")
|
|
mysql_node.query("CREATE DATABASE test_db_disabled;")
|
|
mysql_node.query(
|
|
"CREATE TABLE test_db_disabled.test_table ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;"
|
|
)
|
|
|
|
with PartitionManager() as pm:
|
|
clickhouse_node.query(
|
|
f"CREATE DATABASE test_db_disabled ENGINE = MySQL('mysql80:3306', 'test_db_disabled', 'root', '{mysql_pass}')"
|
|
)
|
|
|
|
pm.add_rule(
|
|
{
|
|
"instance": clickhouse_node,
|
|
"source": clickhouse_node.ip_address,
|
|
"destination_port": 3306,
|
|
"action": "DROP",
|
|
"protocol": "tcp"
|
|
}
|
|
)
|
|
clickhouse_node.query("SELECT * FROM system.parts")
|
|
clickhouse_node.query("SELECT * FROM system.mutations")
|
|
clickhouse_node.query("SELECT * FROM system.graphite_retentions")
|
|
|
|
clickhouse_node.query("DROP DATABASE test_db_disabled")
|