Skip to content

Fixed unit tests fq/s3 + generic #1120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GrigoriyPA merged 5 commits into from
Jan 23, 2024
Merged

Fixed unit tests fq/s3 + generic #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a4577e5
Unmuted unit tests
GrigoriyPA Jan 18, 2024
d3ae240
Fixed ya make
GrigoriyPA Jan 18, 2024
f962f98
Removed skip
GrigoriyPA Jan 19, 2024
683d198
Fixed test_write_result
GrigoriyPA Jan 20, 2024
89abf68
Added comment
GrigoriyPA Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/config/muted_functest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,4 @@ ydb/tests/functional/tenants/test_storage_config.py::TestStorageConfig::*
ydb/tests/functional/tenants/test_tenants.py::*
ydb/tests/functional/audit/*
ydb/tests/functional/clickbench::test.py.test_plans*
ydb/tests/fq/s3*
ydb/tests/fq/yds/test_metrics_cleanup.py::TestCleanup*test_cleanup[v1]
1 change: 0 additions & 1 deletion .github/config/muted_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ ydb-tests-functional-kqp-kqp_query_session/KqpQuerySession::NoLocalAttach
ydb-core-blobstorage-ut_blobstorage/VDiskAssimilation::Test
ydb-core-tx-columnshard-ut_schema/TColumnShardTestSchema::ForgetAfterFail
ydb-core-tx-columnshard-ut_schema/TColumnShardTestSchema::RebootForgetAfterFail
ydb-core-kqp-ut-federated_query-generic/*
ydb-library-yql-sql-pg-ut/PgSqlParsingAutoparam::AutoParamValues_DifferentTypes
ydb-core-blobstorage-ut_blobstorage/[6/10]*
ydb/core/blobstorage/ut_blobstorage/Defragmentation::DoesItWork
2 changes: 0 additions & 2 deletions .github/config/muted_ya.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ ydb/core/persqueue/ut [31/40]*
ydb/core/persqueue/ut TPersQueueMirrorer.TestBasicRemote
ydb/core/quoter/ut QuoterWithKesusTest.PrefetchCoefficient
ydb/core/kqp/provider/ut KikimrIcGateway.TestLoadBasicSecretValueFromExternalDataSourceMetadata
ydb/core/kqp/ut/federated_query/generic *
ydb/core/kqp/ut/olap *
ydb/core/kqp/ut/scan KqpRequestContext.TraceIdInErrorMessage
ydb/core/kqp/ut/scheme KqpOlapScheme.TenThousandColumns
Expand All @@ -35,7 +34,6 @@ ydb/services/ydb/table_split_ut YdbTableSplit.SplitByLoadWithReadsMultipleSplits
ydb/services/ydb/ut YdbOlapStore.LogPagingAfter-NotNull
ydb/tests/fq/generic *
ydb/tests/fq/restarts test_insert_restarts.py.TestS3.test_atomic_upload_commit*
ydb/tests/fq/s3 *
ydb/tests/fq/yds test_metrics_cleanup.py.TestCleanup.test_cleanup[v1]
ydb/tests/functional/audit *
ydb/tests/functional/blobstorage test_replication.py.TestReplicationAfterNodesRestart.test_replication[mirror-3-dc]
Expand Down
10 changes: 10 additions & 0 deletions ydb/core/kqp/ut/federated_query/generic/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@ PEERDIR(

INCLUDE(${ARCADIA_ROOT}/library/recipes/docker_compose/recipe.inc)

# Including of docker_compose/recipe.inc automatically converts these tests into LARGE,
# which makes it impossible to run them during precommit checks on Github CI.
# Next several lines forces these tests to be MEDIUM. To see discussion, visit YDBOPS-8928.

IF (OPENSOURCE)
SIZE(MEDIUM)
SET(TEST_TAGS_VALUE)
SET(TEST_REQUIREMENTS_VALUE)
ENDIF()

YQL_LAST_ABI_VERSION()

END()
6 changes: 3 additions & 3 deletions ydb/tests/fq/s3/test_s3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,9 +358,6 @@ def wait_checkpoints(require_query_is_on=False):
@pytest.mark.parametrize("client", [{"folder_id": "my_folder"}], indirect=True)
@pytest.mark.parametrize("kikimr", [{"compute": 3}], indirect=True)
def test_write_result(self, kikimr, s3, client, yq_version):

pytest.skip("Test is not stable in OSS")

resource = boto3.resource(
"s3",
endpoint_url=s3.s3_url,
Expand All @@ -386,8 +383,11 @@ def test_write_result(self, kikimr, s3, client, yq_version):
fruit += "A" + str(j) + ",1,1\n"
s3_client.put_object(Body=fruit, Bucket='wbucket', Key='fruits' + str(j) + '.csv', ContentType='text/plain')
kikimr.control_plane.wait_bootstrap(1)
kikimr.compute_plane.wait_bootstrap()
client.create_storage_connection("fruitbucket", "wbucket")

time.sleep(10) # 2 x node info update period

sql = R'''
SELECT Fruit, sum(Price) as Price, sum(Weight) as Weight
FROM fruitbucket.`fruits*`
Expand Down