Fixed unit tests fq/s3 + generic (#1120)

* Unmuted unit tests

* Fixed ya make

* Removed skip

* Fixed test_write_result

* Added comment

5 files changed, 13 insertions, 7 deletions

diff --git a/.github/config/muted_functest.txt b/.github/config/muted_functest.txt
index 890053a00f..f14ce2afff 100644
--- a/.github/config/muted_functest.txt
+++ b/.github/config/muted_functest.txt
@@ -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]
diff --git a/.github/config/muted_test.txt b/.github/config/muted_test.txt
index 1487805a73..5d653c79c4 100644
--- a/.github/config/muted_test.txt
+++ b/.github/config/muted_test.txt
@@ -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
diff --git a/.github/config/muted_ya.txt b/.github/config/muted_ya.txt
index f39c2ec992..f5d11cd051 100644
--- a/.github/config/muted_ya.txt
+++ b/.github/config/muted_ya.txt
@@ -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
@@ -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]
diff --git a/ydb/core/kqp/ut/federated_query/generic/ya.make b/ydb/core/kqp/ut/federated_query/generic/ya.make
index 3c5d43c2aa..407624f565 100644
--- a/ydb/core/kqp/ut/federated_query/generic/ya.make
+++ b/ydb/core/kqp/ut/federated_query/generic/ya.make
@@ -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()
diff --git a/ydb/tests/fq/s3/test_s3.py b/ydb/tests/fq/s3/test_s3.py
index d0ed8814bc..091f9efc90 100644
--- a/ydb/tests/fq/s3/test_s3.py
+++ b/ydb/tests/fq/s3/test_s3.py
@@ -358,9 +358,6 @@ Pear,15,33'''
     @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,
@@ -386,8 +383,11 @@ Pear,15,33'''
                 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*`