From 0a5b86670f180cc37b4c9238fdae516e3f7dad0d Mon Sep 17 00:00:00 2001 From: Maxim Yurchuk Date: Mon, 28 Oct 2024 09:12:56 +0000 Subject: [PATCH] Remove some from harness --- ydb/tests/library/harness/param_constants.py | 5 ---- ydb/tests/stability/ydb/test_stability.py | 26 +++++++------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/ydb/tests/library/harness/param_constants.py b/ydb/tests/library/harness/param_constants.py index 92ee11aea691..76a849305b94 100644 --- a/ydb/tests/library/harness/param_constants.py +++ b/ydb/tests/library/harness/param_constants.py @@ -11,18 +11,13 @@ def _get_param(name, default): return default -config_name = _get_param("kikimr.ci.cluster_name", None) ssh_username = _get_param("kikimr.ci.ssh_username", os.getenv('NEMESIS_USER', 'robot-nemesis')) deploy_cluster = _get_param("kikimr.ci.deploy_cluster", "false") == "true" -use_packages = _get_param('kikimr.ci.packages', "false") == "true" - -log_level = int(_get_param('kikimr.ci.driver.log_level', 5)) kikimr_binary_deploy_path = '/Berkanavt/kikimr/bin/kikimr' kikimr_configure_binary_deploy_path = '/Berkanavt/kikimr/bin/kikimr_configure' kikimr_configuration_deploy_path = '/Berkanavt/kikimr/cfg' kikimr_cluster_yaml_deploy_path = '/Berkanavt/kikimr/cfg/cluster.yaml' -blockstore_configs_deploy_path = '/Berkanavt/nbs-server/cfg' kikimr_next_version_deploy_path = '/Berkanavt/kikimr/bin/kikimr_next' kikimr_last_version_deploy_path = '/Berkanavt/kikimr/bin/kikimr_last' kikimr_home = '/Berkanavt/kikimr' diff --git a/ydb/tests/stability/ydb/test_stability.py b/ydb/tests/stability/ydb/test_stability.py index c3d5158d8ce3..6dcbdd2a6ad9 100644 --- a/ydb/tests/stability/ydb/test_stability.py +++ b/ydb/tests/stability/ydb/test_stability.py @@ -20,27 +20,19 @@ logger = logging.getLogger(__name__) -class ImmutableProperty(object): - def __init__(self, value): - super(ImmutableProperty, self).__init__() - self.__value = value - - def __get__(self, instance, owner): - return self.__value - - def __set__(self, instance, value): - raise AttributeError('Attribute is immutable') - - def read_table_profile(): with open(yatest.common.source_path('ydb/tests/stability/resources/tbl_profile.txt'), 'r') as reader: return reader.read() -def get_slice_directory(slice_name): +def get_slice_directory(): return os.getenv('YDB_CLUSTER_YAML_PATH') +def get_slice_name(): + return yatest.common.get_param("kikimr.ci.cluster_name", None) + + class TestSetupForStability(object): stress_binaries_deploy_path = '/Berkanavt/nemesis/bin/' artifacts = ( @@ -52,11 +44,11 @@ class TestSetupForStability(object): @classmethod def setup_class(cls): - cls.slice_name = ImmutableProperty(param_constants.config_name) + cls.slice_name = get_slice_name() assert cls.slice_name is not None logger.info('setup_class started for slice = {}'.format(cls.slice_name)) - cls.kikimr_cluster = kikimr_cluster_factory(config_path=get_slice_directory(cls.slice_name)) + cls.kikimr_cluster = kikimr_cluster_factory(config_path=get_slice_directory()) cls._stop_nemesis() cls.kikimr_cluster.start() @@ -170,10 +162,10 @@ def _stop_nemesis(cls): class TestCheckLivenessAndSafety(object): def test_liveness_and_safety(self): - slice_name = param_constants.config_name + slice_name = get_slice_name() logger.info('slice = {}'.format(slice_name)) assert slice_name is not None - kikimr_cluster = kikimr_cluster_factory(config_path=get_slice_directory(slice_name)) + kikimr_cluster = kikimr_cluster_factory(config_path=get_slice_directory()) composite_assert = CompositeAssert() composite_assert.assert_that( safety_warden_factory(kikimr_cluster).list_of_safety_violations(),