From 8788d760d11627fe985888f3fa82d9a62e29e8e4 Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Thu, 16 Dec 2021 17:05:25 +0800 Subject: [PATCH 1/3] add session cases clear parameter fix client ip --- tests/common/utils.py | 9 +++++ tests/tck/conftest.py | 44 +++++++++++++++++++++++ tests/tck/features/admin/Sessions.feature | 33 +++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 tests/tck/features/admin/Sessions.feature diff --git a/tests/common/utils.py b/tests/common/utils.py index d2ec19a95df..4f434299b9e 100644 --- a/tests/common/utils.py +++ b/tests/common/utils.py @@ -5,6 +5,7 @@ # This source code is licensed under Apache 2.0 License. import os +import re import random import string import time @@ -441,3 +442,11 @@ def get_conn_pool(host: str, port: int): if not pool.init([(host, port)], config): raise Exception("Fail to init connection pool.") return pool + +def parse_service_index(name: str): + name = name.lower() + pattern = r"(graphd|storaged|metad)\[(\d+)\]" + m = re.match(pattern, name) + if m and len(m.groups()) == 2: + return int(m.groups()[1]) + return None diff --git a/tests/tck/conftest.py b/tests/tck/conftest.py index a93cb81dd2f..8ba6052a275 100644 --- a/tests/tck/conftest.py +++ b/tests/tck/conftest.py @@ -30,6 +30,7 @@ response, resp_ok, params, + parse_service_index, ) from tests.common.nebula_service import NebulaService from tests.tck.utils.table import dataset, table @@ -338,6 +339,21 @@ def given_nebulacluster_with_param( class_fixture_variables["cluster"] = nebula_svc class_fixture_variables["pool"] = pool +@when(parse("login {graph} with {user} and {password}")) +def when_login_graphd(graph, user, password, class_fixture_variables, pytestconfig): + index = parse_service_index(graph) + assert index is not None, "Invalid graph name, name is {}".format(graph) + nebula_svc = class_fixture_variables.get("cluster") + assert nebula_svc is not None, "Cannot get the cluster" + assert index < len(nebula_svc.graphd_processes) + graphd_process = nebula_svc.graphd_processes[index] + graph_ip, graph_port = graphd_process.host, graphd_process.tcp_port + pool = get_conn_pool(graph_ip, graph_port) + sess = pool.get_session(user, password) + # do not release original session, as we may have cases to test multiple sessions. + # connection could be released after cluster stopped. + class_fixture_variables["session"] = sess + class_fixture_variables["pool"] = pool @when(parse("executing query:\n{query}")) def executing_query(query, graph_spaces, session, request): @@ -608,6 +624,19 @@ def result_should_contain(request, result, graph_spaces): ) +@then(parse("the result should contain, replace the holders with cluster info:\n{result}")) +def then_result_should_contain_replace(request, result, graph_spaces, class_fixture_variables): + result = replace_result_with_cluster_info(result, class_fixture_variables) + cmp_dataset( + request, + graph_spaces, + result, + order=False, + strict=True, + contains=CmpType.CONTAINS, + ) + + @then(parse("the result should not contain:\n{result}")) def result_should_not_contain(request, result, graph_spaces): cmp_dataset( @@ -804,3 +833,18 @@ def check_client_compatible(graph_spaces): assert ( resp.error_code == ErrorCode.E_CLIENT_SERVER_INCOMPATIBLE ), f'The client was not rejected by server: {resp}' + + +def replace_result_with_cluster_info(result, class_fixture_variables): + pattern = r"\$\{.*?\}" + holders = set(re.findall(pattern, result)) + cluster = class_fixture_variables.get("cluster") + assert cluster is not None, "Cannot get the cluster" + for holder in holders: + try: + eval_string = holder[2:-1] + value = eval(eval_string) + result = result.replace(holder, str(value)) + except: + raise + return result diff --git a/tests/tck/features/admin/Sessions.feature b/tests/tck/features/admin/Sessions.feature new file mode 100644 index 00000000000..7fff0de5656 --- /dev/null +++ b/tests/tck/features/admin/Sessions.feature @@ -0,0 +1,33 @@ +# Copyright (c) 2021 vesoft inc. All rights reserved. +# +# This source code is licensed under Apache 2.0 License. +Feature: Test sessions + + Background: + Given a nebulacluster with 3 graphd and 1 metad and 1 storaged + + Scenario: Show sessions + When executing query: + """ + SHOW SESSIONS; + """ + Then the result should contain: + | SessionId | UserName | SpaceName | CreateTime | UpdateTime | GraphAddr | Timezone | ClientIp | + | /\d+/ | "root" | "" | /.*/ | /.*/ | /.*/ | 0 | "127.0.0.1" | + When executing query: + """ + CREATE USER user1 WITH PASSWORD 'nebula1'; + CREATE SPACE s1(vid_type=int); + USE s1; + """ + Then the execution should be successful + And wait 1 seconds + When login "graphd[1]" with "user1" and "nebula1" + And executing query: + """ + SHOW SESSIONS; + """ + Then the result should contain, replace the holders with cluster info: + | SessionId | UserName | SpaceName | CreateTime | UpdateTime | GraphAddr | Timezone | ClientIp | + | /\d+/ | "root" | "s1" | /.*/ | /.*/ | "127.0.0.1:${cluster.graphd_processes[0].tcp_port}" | 0 | "127.0.0.1" | + | /\d+/ | "user1" | "" | /.*/ | /.*/ | "127.0.0.1:${cluster.graphd_processes[1].tcp_port}" | 0 | "127.0.0.1" | From 0f63d25d461459fb2c2c6d053c206edff9ee8f47 Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Fri, 17 Dec 2021 11:54:53 +0800 Subject: [PATCH 2/3] fix parser --- tests/tck/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tck/conftest.py b/tests/tck/conftest.py index 8ba6052a275..43df9d343b6 100644 --- a/tests/tck/conftest.py +++ b/tests/tck/conftest.py @@ -339,7 +339,7 @@ def given_nebulacluster_with_param( class_fixture_variables["cluster"] = nebula_svc class_fixture_variables["pool"] = pool -@when(parse("login {graph} with {user} and {password}")) +@when(parse('login "{graph}" with "{user}" and "{password}"')) def when_login_graphd(graph, user, password, class_fixture_variables, pytestconfig): index = parse_service_index(graph) assert index is not None, "Invalid graph name, name is {}".format(graph) From bcbb57680ccf2fddddd714ae7716ccb059ee149e Mon Sep 17 00:00:00 2001 From: HarrisChu <1726587+HarrisChu@users.noreply.github.com> Date: Wed, 22 Dec 2021 10:03:17 +0800 Subject: [PATCH 3/3] wait more time --- tests/tck/features/admin/Sessions.feature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/tck/features/admin/Sessions.feature b/tests/tck/features/admin/Sessions.feature index 7fff0de5656..de812fad7f1 100644 --- a/tests/tck/features/admin/Sessions.feature +++ b/tests/tck/features/admin/Sessions.feature @@ -21,7 +21,7 @@ Feature: Test sessions USE s1; """ Then the execution should be successful - And wait 1 seconds + And wait 3 seconds When login "graphd[1]" with "user1" and "nebula1" And executing query: """