separate integration tests for keeper-client

tests/integration/helpers/keeper_utils.py

@@ -1,18 +1,26 @@
 import socket
 import time
-from helper.client import CommandRequest
+
+
+def get_keeper_socket(cluster, node, port=9181):
+    hosts = cluster.get_instance_ip(node.name)
+    client = socket.socket()
+    client.settimeout(10)
+    client.connect((hosts, port))
+    return client
 
 
 def send_4lw_cmd(cluster, node, cmd="ruok", port=9181):
-    return CommandRequest(
-        [
-            "cluster.server_bin_path",
-            "keeper-client",
-            f"{cluster.get_instance_ip(node.name)}:{port}",
-            "-q",
-            cmd,
-        ]
-    ).get_answer()
+    client = None
+    try:
+        client = get_keeper_socket(cluster, node, port)
+        client.send(cmd.encode())
+        data = client.recv(100_000)
+        data = data.decode()
+        return data
+    finally:
+        if client is not None:
+            client.close()
 
 
 NOT_SERVING_REQUESTS_ERROR_MSG = "This instance is not currently serving requests"

tests/integration/test_keeper_client/configs/keeper_config.xml

@@ -0,0 +1,3 @@
+<clickhouse>
+
+</clickhouse>

tests/integration/test_keeper_client/test.py

@@ -0,0 +1,57 @@
+import pytest
+from helpers.client import CommandRequest
+from helpers.cluster import ClickHouseCluster
+
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/keeper_config.xml"],
+    with_zookeeper=True,
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_base_commands(started_cluster):
+    _ = started_cluster
+
+    command = CommandRequest(
+        [
+            started_cluster.server_bin_path,
+            "keeper-client",
+            f"{cluster.get_instance_ip('zoo1')}:{cluster.zookeeper_port}",
+            "-q",
+            "create test_create_zk_node1 testvalue1;create test_create_zk_node_2 testvalue2;get test_create_zk_node1;",
+        ],
+        stdin="",
+    )
+
+    assert command.get_answer() == "testvalue1\n"
+
+
+def test_four_letter_word_commands(started_cluster):
+    _ = started_cluster
+
+    command = CommandRequest(
+        [
+            started_cluster.server_bin_path,
+            "keeper-client",
+            f"{cluster.get_instance_ip('zoo1')}:{cluster.zookeeper_port}",
+            "-q",
+            "ruok",
+        ],
+        stdin="",
+    )
+
+    assert command.get_answer() == "imok\n"