test: simplify using of tcs fixture

Part of #1193

Author: elhimov

test/conftest.py

@@ -3,6 +3,7 @@
 import shutil
 import signal
 import subprocess
+from collections import namedtuple
 from pathlib import Path
 
 import etcd_helper
@@ -164,27 +165,51 @@ def cartridge_app(request, cartridge_app_session):
     return cartridge_app_session
 
 
-@pytest.fixture
-def fixture_params():
-    return {}
+TcsParams = namedtuple(
+    "TcsParams",
+    [
+        "path_to_cfg_dir",
+        "connection_test",
+        "connection_test_user",
+        "connection_test_password",
+        "instance_name",
+        "instance_port",
+        "instance_host",
+    ],
+)
+
+
+@pytest.fixture(scope="function")
+def tcs_params(request) -> TcsParams:
+    return TcsParams(
+        path_to_cfg_dir=request.path.parent / "test_tcs_app",
+        connection_test=True,
+        connection_test_user="client",
+        connection_test_password="secret",
+        instance_name="instance-001",
+        instance_host="localhost",
+        instance_port="3303",
+    )
 
 
 @pytest.fixture(scope="function")
-def tcs(request, tmp_path, fixture_params):
-    test_app_path = os.path.join(fixture_params.get("path_to_cfg_dir"), "config.yaml")
+def tcs(request, tmp_path, tcs_params):
+    if utils.is_tarantool_less_3() or not utils.is_tarantool_ee():
+        pytest.skip()
+    test_app_path = tcs_params.path_to_cfg_dir / "config.yaml"
     inst = utils.TarantoolTestInstance(
         test_app_path,
-        fixture_params.get("path_to_cfg_dir"),
+        tcs_params.path_to_cfg_dir,
         "",
         tmp_path,
     )
     inst.start(
-        connection_test=fixture_params.get("connection_test"),
-        connection_test_user=fixture_params.get("connection_test_user"),
-        connection_test_password=fixture_params.get("connection_test_password"),
-        instance_name=fixture_params.get("instance_name"),
-        instance_host=fixture_params.get("instance_host"),
-        instance_port=fixture_params.get("instance_port"),
+        connection_test=tcs_params.connection_test,
+        connection_test_user=tcs_params.connection_test_user,
+        connection_test_password=tcs_params.connection_test_password,
+        instance_name=tcs_params.instance_name,
+        instance_host=tcs_params.instance_host,
+        instance_port=tcs_params.instance_port,
     )
     request.addfinalizer(lambda: inst.stop())
     return inst

test/integration/aeon/test_aeon.py

@@ -5,12 +5,6 @@
 
 import pytest
 
-from utils import get_fixture_tcs_params, is_tarantool_ee, is_tarantool_less_3
-
-fixture_tcs_params = get_fixture_tcs_params(
-    os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_tcs_app"),
-)
-
 AeonConnectCommand = ("aeon", "connect")
 
 
@@ -385,11 +379,7 @@ def test_cli_plain_app_success(tt_cmd, app_name, tmpdir_with_cfg, aeon_plain_fil
     assert tt.returncode == 0
 
 
-def test_cli_plain_tcs_success(tt_cmd, tmpdir_with_cfg, request, fixture_params, aeon_plain_file):
-    if is_tarantool_less_3() or not is_tarantool_ee():
-        pytest.skip()
-    for k, v in fixture_tcs_params.items():
-        fixture_params[k] = v
+def test_cli_plain_tcs_success(tt_cmd, tmpdir_with_cfg, request, aeon_plain_file):
     instance = request.getfixturevalue("tcs")
     tmpdir = tmpdir_with_cfg
 

test/integration/cluster/test_cluster_demote.py

@@ -1,17 +1,9 @@
 import pytest
-from tarantool.connection import os
 
 from utils import (
-    get_fixture_tcs_params,
-    is_tarantool_ee,
-    is_tarantool_less_3,
     run_command_and_get_output,
 )
 
-fixture_tcs_params = get_fixture_tcs_params(
-    os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_tcs_app"),
-)
-
 
 def to_etcd_key(key):
     return f"/prefix/config/{key}"
@@ -41,12 +33,7 @@ def to_etcd_key(key):
 
 
 @pytest.mark.parametrize("instance_name", ["etcd", "tcs"])
-def test_cluster_demote_single_key(tt_cmd, tmpdir_with_cfg, instance_name, request, fixture_params):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
+def test_cluster_demote_single_key(tt_cmd, tmpdir_with_cfg, instance_name, request):
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
     conn = instance.conn()
@@ -104,13 +91,7 @@ def test_cluster_demote_many_keys(
     key,
     instance_name,
     request,
-    fixture_params,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
     conn = instance.conn()
@@ -186,15 +167,9 @@ def test_cluster_demote_no_auth(
     tt_cmd,
     tmpdir_with_cfg,
     instance_name,
-    fixture_params,
     request,
     err_msg,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
 
@@ -231,14 +206,8 @@ def test_cluster_demote_bad_auth(
     tmpdir_with_cfg,
     instance_name,
     err_msg,
-    fixture_params,
     request,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
 
@@ -268,12 +237,7 @@ def test_cluster_demote_bad_auth(
         ("tcs", "env"),
     ],
 )
-def test_cluster_demote_auth(tt_cmd, tmpdir_with_cfg, instance_name, auth, fixture_params, request):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
+def test_cluster_demote_auth(tt_cmd, tmpdir_with_cfg, instance_name, auth, request):
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
     conn = instance.conn()

test/integration/cluster/test_cluster_expel.py

@@ -1,17 +1,9 @@
 import pytest
-from tarantool.connection import os
 
 from utils import (
-    get_fixture_tcs_params,
-    is_tarantool_ee,
-    is_tarantool_less_3,
     run_command_and_get_output,
 )
 
-fixture_tcs_params = get_fixture_tcs_params(
-    os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_tcs_app"),
-)
-
 
 def to_etcd_key(key):
     return f"/prefix/config/{key}"
@@ -38,12 +30,7 @@ def test_cluster_expel_missing_instance_arg(tt_cmd, tmpdir_with_cfg):
 
 
 @pytest.mark.parametrize("instance_name", ["etcd", "tcs"])
-def test_cluster_expel_no_instance(tt_cmd, tmpdir_with_cfg, instance_name, fixture_params, request):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
+def test_cluster_expel_no_instance(tt_cmd, tmpdir_with_cfg, instance_name, request):
     instance = request.getfixturevalue(instance_name)
 
     conn = instance.conn()
@@ -68,12 +55,7 @@ def test_cluster_expel_no_instance(tt_cmd, tmpdir_with_cfg, instance_name, fixtu
 
 
 @pytest.mark.parametrize("instance_name", ["etcd", "tcs"])
-def test_cluster_expel_single_key(tt_cmd, tmpdir_with_cfg, instance_name, fixture_params, request):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
+def test_cluster_expel_single_key(tt_cmd, tmpdir_with_cfg, instance_name, request):
     instance = request.getfixturevalue(instance_name)
     conn = instance.conn()
     tmpdir = tmpdir_with_cfg

test/integration/cluster/test_cluster_promote.py

@@ -3,17 +3,10 @@
 import pytest
 
 from utils import (
-    get_fixture_tcs_params,
-    is_tarantool_ee,
-    is_tarantool_less_3,
     read_kv,
     run_command_and_get_output,
 )
 
-fixture_tcs_params = get_fixture_tcs_params(
-    os.path.join(os.path.dirname(os.path.abspath(__file__)), "test_tcs_app"),
-)
-
 
 def to_etcd_key(key):
     return f"/prefix/config/{key}"
@@ -140,14 +133,8 @@ def test_cluster_promote_single_key(
     data_dir,
     err_text,
     instance_name,
-    fixture_params,
     request,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     test_data_dir = os.path.join(
         os.path.dirname(__file__),
@@ -263,14 +250,8 @@ def test_cluster_promote_many_keys(
     exp_key,
     err_text,
     instance_name,
-    fixture_params,
     request,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     conn = instance.conn()
     tmpdir = tmpdir_with_cfg
@@ -332,14 +313,8 @@ def test_cluster_promote_key_specified(
     tt_cmd,
     tmpdir_with_cfg,
     instance_name,
-    fixture_params,
     request,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     conn = instance.conn()
     tmpdir = tmpdir_with_cfg
@@ -414,14 +389,8 @@ def test_cluster_promote_no_auth(
     tmpdir_with_cfg,
     instance_name,
     err_msg,
-    fixture_params,
     request,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
 
@@ -458,14 +427,8 @@ def test_cluster_promote_bad_auth(
     tmpdir_with_cfg,
     instance_name,
     err_msg,
-    fixture_params,
     request,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
 
@@ -521,14 +484,8 @@ def test_cluster_promote_auth(
     tmpdir_with_cfg,
     instance_name,
     auth,
-    fixture_params,
     request,
 ):
-    if instance_name == "tcs":
-        if is_tarantool_less_3() or not is_tarantool_ee():
-            pytest.skip()
-        for k, v in fixture_tcs_params.items():
-            fixture_params[k] = v
     instance = request.getfixturevalue(instance_name)
     tmpdir = tmpdir_with_cfg
     conn = instance.conn()