From 66f76b6fbbcceb0c0b25a35341bfdd7a4d33aad4 Mon Sep 17 00:00:00 2001 From: st-shchetinin Date: Tue, 22 Jul 2025 17:37:30 +0300 Subject: [PATCH 1/3] done --- .../test_export_import_s3.py | 0 .../test_export_import_s3/ya.make | 29 +++++++++++++++++++ ydb/tests/compatibility/ya.make | 7 +++-- 3 files changed, 33 insertions(+), 3 deletions(-) rename ydb/tests/compatibility/{ => test_export_import_s3}/test_export_import_s3.py (100%) create mode 100644 ydb/tests/compatibility/test_export_import_s3/ya.make diff --git a/ydb/tests/compatibility/test_export_import_s3.py b/ydb/tests/compatibility/test_export_import_s3/test_export_import_s3.py similarity index 100% rename from ydb/tests/compatibility/test_export_import_s3.py rename to ydb/tests/compatibility/test_export_import_s3/test_export_import_s3.py diff --git a/ydb/tests/compatibility/test_export_import_s3/ya.make b/ydb/tests/compatibility/test_export_import_s3/ya.make new file mode 100644 index 000000000000..c69f93b8afc5 --- /dev/null +++ b/ydb/tests/compatibility/test_export_import_s3/ya.make @@ -0,0 +1,29 @@ +PY3TEST() +INCLUDE(${ARCADIA_ROOT}/ydb/tests/ydbd_dep.inc) + +FORK_TEST_FILES() +FORK_TESTS() +FORK_SUBTESTS() +SPLIT_FACTOR(10) + +TEST_SRCS( + test_export_import_s3.py +) + +SIZE(LARGE) +REQUIREMENTS(cpu:16) +INCLUDE(${ARCADIA_ROOT}/ydb/tests/large.inc) +INCLUDE(${ARCADIA_ROOT}/ydb/tests/tools/s3_recipe/recipe.inc) + + +DEPENDS( + ydb/tests/library/compatibility/binaries +) + +PEERDIR( + contrib/python/boto3 + ydb/tests/library + ydb/tests/library/compatibility +) + +END() diff --git a/ydb/tests/compatibility/ya.make b/ydb/tests/compatibility/ya.make index cdc86a174b2e..df5cdf1f262f 100644 --- a/ydb/tests/compatibility/ya.make +++ b/ydb/tests/compatibility/ya.make @@ -9,7 +9,6 @@ SPLIT_FACTOR(10) TEST_SRCS( test_example.py - test_export_import_s3.py test_followers.py test_compatibility.py test_stress.py @@ -28,7 +27,6 @@ TEST_SRCS( SIZE(LARGE) REQUIREMENTS(cpu:16) INCLUDE(${ARCADIA_ROOT}/ydb/tests/large.inc) -INCLUDE(${ARCADIA_ROOT}/ydb/tests/tools/s3_recipe/recipe.inc) DEPENDS( @@ -37,11 +35,14 @@ DEPENDS( ) PEERDIR( - contrib/python/boto3 ydb/tests/library ydb/tests/datashard/lib ydb/tests/stress/simple_queue/workload ydb/tests/library/compatibility ) +RECURSE_FOR_TESTS ( + test_export_import_s3 +) + END() From 629e6ab62d1622763baecf746eff475f7731bb5a Mon Sep 17 00:00:00 2001 From: st-shchetinin Date: Wed, 23 Jul 2025 18:30:46 +0300 Subject: [PATCH 2/3] s3_backups --- .../test_export_import_s3.py | 0 .../{test_export_import_s3 => s3_backups}/ya.make | 0 ydb/tests/compatibility/ya.make | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename ydb/tests/compatibility/{test_export_import_s3 => s3_backups}/test_export_import_s3.py (100%) rename ydb/tests/compatibility/{test_export_import_s3 => s3_backups}/ya.make (100%) diff --git a/ydb/tests/compatibility/test_export_import_s3/test_export_import_s3.py b/ydb/tests/compatibility/s3_backups/test_export_import_s3.py similarity index 100% rename from ydb/tests/compatibility/test_export_import_s3/test_export_import_s3.py rename to ydb/tests/compatibility/s3_backups/test_export_import_s3.py diff --git a/ydb/tests/compatibility/test_export_import_s3/ya.make b/ydb/tests/compatibility/s3_backups/ya.make similarity index 100% rename from ydb/tests/compatibility/test_export_import_s3/ya.make rename to ydb/tests/compatibility/s3_backups/ya.make diff --git a/ydb/tests/compatibility/ya.make b/ydb/tests/compatibility/ya.make index df5cdf1f262f..1cc834c25016 100644 --- a/ydb/tests/compatibility/ya.make +++ b/ydb/tests/compatibility/ya.make @@ -41,8 +41,8 @@ PEERDIR( ydb/tests/library/compatibility ) -RECURSE_FOR_TESTS ( - test_export_import_s3 +RECURSE ( + s3_backups ) END() From 389d31ffeff1f83301611537bfd09e1a992b3b78 Mon Sep 17 00:00:00 2001 From: st-shchetinin Date: Thu, 24 Jul 2025 13:52:11 +0300 Subject: [PATCH 3/3] recurse fix --- ydb/tests/compatibility/ya.make | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ydb/tests/compatibility/ya.make b/ydb/tests/compatibility/ya.make index 1cc834c25016..0391646bd3c8 100644 --- a/ydb/tests/compatibility/ya.make +++ b/ydb/tests/compatibility/ya.make @@ -41,8 +41,8 @@ PEERDIR( ydb/tests/library/compatibility ) -RECURSE ( +END() + +RECURSE( s3_backups ) - -END()