Skip to content

Commit a5fdd83

Browse files
authored
YDB FQ: split ydb/tests/fq/generic into two folders (#9029)
1 parent ab1832e commit a5fdd83

File tree

29 files changed

+354
-127
lines changed

29 files changed

+354
-127
lines changed

ydb/library/yql/providers/generic/connector/tests/datasource/ms_sql_server/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def wait(self):
5757

5858
start = datetime.now()
5959
actual_tables: Set[str] = None
60-
timeout = 60
60+
timeout = 600
6161

6262
while (datetime.now() - start).total_seconds() < timeout:
6363
try:

ydb/library/yql/providers/generic/connector/tests/datasource/mysql/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def wait(self):
6060

6161
start = datetime.now()
6262
actual_tables: Set[str] = None
63-
timeout = 60
63+
timeout = 600
6464

6565
while (datetime.now() - start).total_seconds() < timeout:
6666
try:

ydb/library/yql/providers/generic/connector/tests/datasource/oracle/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def wait(self):
6363

6464
start = datetime.now()
6565
actual_tables: Set[str] = None
66-
timeout = 60
66+
timeout = 600
6767

6868
while (datetime.now() - start).total_seconds() < timeout:
6969
try:

ydb/library/yql/providers/generic/connector/tests/datasource/ydb/test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def wait(self):
3838
# This should be enough for tables to initialize
3939
start = datetime.now()
4040

41-
timeout = 60
41+
timeout = 600
4242
while (datetime.now() - start).total_seconds() < timeout:
4343
self.actual_tables = set(self.docker_compose_helper.list_ydb_tables())
4444

ydb/library/yql/providers/generic/connector/tests/utils/run/kqprun.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@ class AppConfigRenderer:
181181
EnableScriptExecutionOperations: true
182182
}
183183
184+
TableServiceConfig {
185+
CompileTimeoutMs: 600000
186+
}
187+
184188
QueryServiceConfig {
185189
Generic {
186190
Connector {

ydb/library/yql/providers/generic/connector/tests/utils/run/parent.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
from ydb.library.yql.providers.generic.connector.tests.utils.run.result import Result
77

88

9-
# 3 mins
10-
DefaultTimeout: Final = 180
9+
# 10 mins, because database startup is very slow on Github CI
10+
DefaultTimeout: Final = 600
1111

1212

1313
class Runner(ABC):

ydb/tests/fq/generic/conftest.py renamed to ydb/tests/fq/generic/analytics/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@pytest.fixture
1616
def settings() -> Settings:
17-
return Settings.from_env()
17+
return Settings.from_env(docker_compose_file_path='ydb/tests/fq/generic/analytics/docker-compose.yml')
1818

1919

2020
@pytest.fixture

ydb/tests/fq/generic/docker-compose.yml renamed to ydb/tests/fq/generic/analytics/docker-compose.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
clickhouse:
3-
container_name: tests-fq-generic-clickhouse
3+
container_name: tests-fq-generic-analytics-clickhouse
44
environment:
55
CLICKHOUSE_DB: db
66
CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT: 1
@@ -16,14 +16,14 @@ services:
1616
fq-connector-go:
1717
command: |
1818
sh -c "
19-
echo \"$$(dig tests-fq-generic-ydb +short) tests-fq-generic-ydb\" >> /etc/hosts; cat /etc/hosts;
19+
echo \"$$(dig tests-fq-generic-analytics-ydb +short) tests-fq-generic-analytics-ydb\" >> /etc/hosts; cat /etc/hosts;
2020
/opt/ydb/bin/fq-connector-go server -c /opt/ydb/cfg/fq-connector-go.yaml"
21-
container_name: tests-fq-generic-fq-connector-go
21+
container_name: tests-fq-generic-analytics-fq-connector-go
2222
image: ghcr.io/ydb-platform/fq-connector-go:v0.5.8-rc.2@sha256:12d15f2e82608bc4e64fa91c549361c587754aeb0e6c6a2cee749caebb11baf8
2323
ports:
2424
- "2130"
2525
greenplum:
26-
container_name: tests-fq-generic-greenplum
26+
container_name: tests-fq-generic-analytics-greenplum
2727
image: ghcr.io/ydb-platform/fq-connector-go_greenplum:6.25.3-6432@sha256:9e862b05719b289b447562fbce6c003916a764a549f924a4175eecd7e7891a0b
2828
volumes:
2929
- ./greenplum/init_db.sh:/init_db.sh
@@ -33,7 +33,7 @@ services:
3333
- /var
3434
postgresql:
3535
command: -p 6432
36-
container_name: tests-fq-generic-postgresql
36+
container_name: tests-fq-generic-analytics-postgresql
3737
environment:
3838
POSTGRES_DB: db
3939
POSTGRES_PASSWORD: password
@@ -46,13 +46,13 @@ services:
4646
- /tmp
4747
- /var
4848
ydb:
49-
container_name: tests-fq-generic-ydb
49+
container_name: tests-fq-generic-analytics-ydb
5050
environment:
5151
POSTGRES_PASSWORD: password
5252
POSTGRES_USER: user
5353
YDB_DEFAULT_LOG_LEVEL: DEBUG
5454
DB_USE_IN_MEMORY_PDISKS: "true"
55-
hostname: tests-fq-generic-ydb
55+
hostname: tests-fq-generic-analytics-ydb
5656
image: ghcr.io/ydb-platform/local-ydb:latest@sha256:9045e00afec1923dc3277564c7b2f829087c2115f45f18e1d38b80bb89f98be6
5757
volumes:
5858
- ./ydb/init_ydb:/init_ydb

0 commit comments

Comments
 (0)