Skip to content

Commit c1c873a

Browse files
maximyurchukmaximyurchuk
authored
Refactor harness (#11211)
1 parent 8950220 commit c1c873a

File tree

60 files changed

+147
-145
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+147
-145
lines changed

‎ydb/public/tools/lib/cmds/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import yatest
1414

1515
from ydb.library.yql.providers.common.proto.gateways_config_pb2 import TGenericConnectorConfig
16-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
16+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
1717
from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
1818
from ydb.tests.library.common.types import Erasure
1919
from ydb.tests.library.harness.daemon import Daemon
@@ -375,7 +375,7 @@ def deploy(arguments):
375375
**optionals
376376
)
377377

378-
cluster = kikimr_cluster_factory(configuration)
378+
cluster = KiKiMR(configuration)
379379
cluster.start()
380380

381381
info = {'nodes': {}}

‎ydb/tests/functional/api/test_crud.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
from hamcrest import assert_that, equal_to, raises
77

8-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
8+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
99
from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
1010
from ydb.tests.oss.ydb_sdk_import import ydb
1111

@@ -16,7 +16,7 @@
1616
class TestCreateAndUpsertWithRepetitions(object):
1717
@classmethod
1818
def setup_class(cls):
19-
cls.cluster = kikimr_cluster_factory()
19+
cls.cluster = KiKiMR()
2020
cls.cluster.start()
2121
cls.driver = ydb.Driver(
2222
ydb.DriverConfig(
@@ -73,7 +73,7 @@ def test_create_and_upsert_data_with_repetitions(self, repetitions, column_count
7373
class TestCRUDOperations(object):
7474
@classmethod
7575
def setup_class(cls):
76-
cls.cluster = kikimr_cluster_factory(KikimrConfigGenerator(load_udfs=True))
76+
cls.cluster = KiKiMR(KikimrConfigGenerator(load_udfs=True))
7777
cls.cluster.start()
7878
cls.driver = ydb.Driver(
7979
ydb.DriverConfig(
@@ -134,7 +134,7 @@ def callee():
134134
class TestSelect(object):
135135
@classmethod
136136
def setup_class(cls):
137-
cls.cluster = kikimr_cluster_factory(KikimrConfigGenerator(load_udfs=True))
137+
cls.cluster = KiKiMR(KikimrConfigGenerator(load_udfs=True))
138138
cls.cluster.start()
139139
cls.driver = ydb.Driver(
140140
ydb.DriverConfig(
@@ -189,7 +189,7 @@ def callee():
189189
class TestClientTimeouts(object):
190190
@classmethod
191191
def setup_class(cls):
192-
cls.cluster = kikimr_cluster_factory()
192+
cls.cluster = KiKiMR()
193193
cls.cluster.start()
194194
cls.driver_config = ydb.DriverConfig(
195195
database='/Root', endpoint="%s:%s" % (
@@ -242,7 +242,7 @@ class TestManySelectsInRow(object):
242242
"""
243243
@classmethod
244244
def setup_class(cls):
245-
cls.cluster = kikimr_cluster_factory()
245+
cls.cluster = KiKiMR()
246246
cls.cluster.start()
247247
cls.driver = ydb.Driver(
248248
ydb.DriverConfig(

‎ydb/tests/functional/api/test_discovery.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from hamcrest import assert_that, is_, not_
88

9-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
9+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
1010
from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
1111
from ydb.tests.library.common import types
1212
from ydb.tests.oss.ydb_sdk_import import ydb
@@ -23,7 +23,7 @@ def setup_class(cls):
2323
cls.ext_port_2 = conf.port_allocator.get_node_port_allocator(1).ext_port
2424
conf.clone_grpc_as_ext_endpoint(cls.ext_port_1, "extserv1")
2525
conf.clone_grpc_as_ext_endpoint(cls.ext_port_2, "extserv2")
26-
cls.cluster = kikimr_cluster_factory(
26+
cls.cluster = KiKiMR(
2727
configurator=conf
2828
)
2929
cls.cluster.start()
@@ -112,7 +112,7 @@ def test_scenario(self):
112112
class AbstractTestDiscoveryFaultInjection(object):
113113
@classmethod
114114
def setup_class(cls):
115-
cls.cluster = kikimr_cluster_factory()
115+
cls.cluster = KiKiMR()
116116
cls.cluster.start()
117117
cls.database_name = '/Root/database'
118118
cls.logger = logger.getChild(cls.__name__)
@@ -214,7 +214,7 @@ def fault_injection_name(self):
214214
class TestMirror3DCDiscovery(object):
215215
@classmethod
216216
def setup_class(cls):
217-
cls.cluster = kikimr_cluster_factory(KikimrConfigGenerator(erasure=types.Erasure.MIRROR_3_DC, use_in_memory_pdisks=False))
217+
cls.cluster = KiKiMR(KikimrConfigGenerator(erasure=types.Erasure.MIRROR_3_DC, use_in_memory_pdisks=False))
218218
cls.cluster.start()
219219

220220
@classmethod

‎ydb/tests/functional/api/test_execute_scheme.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import logging
33
from hamcrest import assert_that, raises
44

5-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
5+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
66
from ydb.tests.oss.ydb_sdk_import import ydb
77

88
logger = logging.getLogger(__name__)
@@ -11,7 +11,7 @@
1111
class TestExecuteSchemeOperations(object):
1212
@classmethod
1313
def setup_class(cls):
14-
cls.cluster = kikimr_cluster_factory()
14+
cls.cluster = KiKiMR()
1515
cls.cluster.start()
1616
cls.driver_config = ydb.DriverConfig(
1717
"%s:%s" % (cls.cluster.nodes[1].host, cls.cluster.nodes[1].port), database='/Root')

‎ydb/tests/functional/api/test_indexes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from hamcrest import assert_that, is_
55

6-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
6+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
77
from ydb.tests.oss.ydb_sdk_import import ydb
88

99
logger = logging.getLogger(__name__)
@@ -12,7 +12,7 @@
1212
class TestSecondaryIndexes(object):
1313
@classmethod
1414
def setup_class(cls):
15-
cls.cluster = kikimr_cluster_factory()
15+
cls.cluster = KiKiMR()
1616
cls.cluster.start()
1717
cls.logger = logger.getChild(cls.__name__)
1818
cls.driver = ydb.Driver(

‎ydb/tests/functional/api/test_insert.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
from hamcrest import assert_that, raises, equal_to
55

6-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
6+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
77
from ydb.tests.oss.ydb_sdk_import import ydb
88

99

@@ -13,7 +13,7 @@
1313
class TestInsertOperations(object):
1414
@classmethod
1515
def setup_class(cls):
16-
cls.cluster = kikimr_cluster_factory()
16+
cls.cluster = KiKiMR()
1717
cls.cluster.start()
1818
cls.driver_config = ydb.DriverConfig(
1919
"%s:%s" % (cls.cluster.nodes[1].host, cls.cluster.nodes[1].port), database='/Root')

‎ydb/tests/functional/api/test_isolation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# -*- coding: utf-8 -*-
22
from hamcrest import assert_that, equal_to, raises, contains_string
33

4-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
4+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
55
from ydb.tests.oss.ydb_sdk_import import ydb
66

77

@@ -12,7 +12,7 @@ class TestTransactionIsolation(object):
1212
"""
1313
@classmethod
1414
def setup_class(cls):
15-
cls.cluster = kikimr_cluster_factory()
15+
cls.cluster = KiKiMR()
1616
cls.cluster.start()
1717
cls.driver = ydb.Driver(
1818
ydb.DriverConfig(

‎ydb/tests/functional/api/test_public_api.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from datetime import date, datetime
1515
from ydb.public.api.protos import ydb_table_pb2
1616
from ydb.public.api.protos import ydb_scheme_pb2
17-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
17+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
1818
from ydb.tests.library.harness.kikimr_config import KikimrConfigGenerator
1919
from ydb.tests.library.harness.util import LogLevels
2020
from ydb.tests.oss.ydb_sdk_import import ydb
@@ -90,7 +90,7 @@ def wrap(select, result):
9090
class Base(object):
9191
@classmethod
9292
def setup_class(cls):
93-
cls.cluster = kikimr_cluster_factory(
93+
cls.cluster = KiKiMR(
9494
KikimrConfigGenerator(
9595
additional_log_configs={
9696
'TENANT_POOL': LogLevels.DEBUG,
@@ -118,7 +118,7 @@ def teardown_class(cls):
118118
class WithTenant(Base):
119119
@classmethod
120120
def setup_class(cls):
121-
cls.cluster = kikimr_cluster_factory()
121+
cls.cluster = KiKiMR()
122122
cls.cluster.start()
123123
cls.database_name = "/Root/tenant"
124124
cls.cluster.create_database(
@@ -1518,7 +1518,7 @@ def test_driver_recovery(self):
15181518
class TestSelectAfterDropWithRepetitions(object):
15191519
@classmethod
15201520
def setup_class(cls):
1521-
cls.cluster = kikimr_cluster_factory(
1521+
cls.cluster = KiKiMR(
15221522
configurator=KikimrConfigGenerator(
15231523
additional_log_configs={
15241524
'TX_PROXY': LogLevels.DEBUG,
@@ -1587,7 +1587,7 @@ def callee():
15871587
class TestMetaDataInvalidation(object):
15881588
@classmethod
15891589
def setup_class(cls):
1590-
cls.cluster = kikimr_cluster_factory()
1590+
cls.cluster = KiKiMR()
15911591
cls.cluster.start()
15921592
cls.driver = ydb.Driver(ydb.DriverConfig(
15931593
database="/Root",
@@ -1673,7 +1673,7 @@ def invalid_callee2():
16731673
class TestJsonExample(object):
16741674
@classmethod
16751675
def setup_class(cls):
1676-
cls.cluster = kikimr_cluster_factory()
1676+
cls.cluster = KiKiMR()
16771677
cls.cluster.start()
16781678
cls.driver = ydb.Driver(ydb.DriverConfig(
16791679
database="/Root",
@@ -1759,7 +1759,7 @@ def test_json_success(self):
17591759
class TestForPotentialDeadlock(object):
17601760
@classmethod
17611761
def setup_class(cls):
1762-
cls.cluster = kikimr_cluster_factory()
1762+
cls.cluster = KiKiMR()
17631763
cls.cluster.start()
17641764

17651765
@classmethod

‎ydb/tests/functional/api/test_read_table.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from hamcrest import assert_that, equal_to, less_than_or_equal_to, is_, none
77
from concurrent import futures
88

9-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
9+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
1010
from ydb.tests.library.common.types import TabletTypes
1111
from ydb.tests.oss.ydb_sdk_import import ydb
1212
# call this as soon as possible to patch grpc event_handler implementation with additional calls
@@ -18,7 +18,7 @@
1818
class AbstractReadTableTest(object):
1919
@classmethod
2020
def setup_class(cls):
21-
cls.cluster = kikimr_cluster_factory()
21+
cls.cluster = KiKiMR()
2222
cls.cluster.start()
2323
cls.logger = logger.getChild(cls.__name__)
2424
cls.driver = ydb.Driver(

‎ydb/tests/functional/api/test_session_grace_shutdown.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import logging
33
import time
44

5-
from ydb.tests.library.harness.kikimr_cluster import kikimr_cluster_factory
5+
from ydb.tests.library.harness.kikimr_runner import KiKiMR
66
from ydb.tests.oss.ydb_sdk_import import ydb
77
import requests
88

@@ -12,7 +12,7 @@
1212
class Test(object):
1313
@classmethod
1414
def setup_class(cls):
15-
cls.cluster = kikimr_cluster_factory()
15+
cls.cluster = KiKiMR()
1616
cls.cluster.start()
1717
cls.driver_config = ydb.DriverConfig(
1818
"%s:%s" % (cls.cluster.nodes[1].host, cls.cluster.nodes[1].port), database='/Root')
@@ -55,7 +55,7 @@ def test_grace_shutdown_of_session(self):
5555
class TestIdle(object):
5656
@classmethod
5757
def setup_class(cls):
58-
cls.cluster = kikimr_cluster_factory()
58+
cls.cluster = KiKiMR()
5959
cls.cluster.start()
6060
cls.driver_config = ydb.DriverConfig(
6161
"%s:%s" % (cls.cluster.nodes[1].host, cls.cluster.nodes[1].port), database='/Root')

0 commit comments

Comments
 (0)