Skip to content

remove confusing timeout macro #11431

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
merged 2 commits into from
Nov 29, 2024
Merged

remove confusing timeout macro #11431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0911641
remove timeout macro
uzhastik Nov 8, 2024
1581bd7
revert essentials
uzhastik Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions ydb/apps/ydb/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
UNITTEST()

IF (SANITIZER_TYPE)
TIMEOUT(2400)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/actorlib_impl/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ UNITTEST_FOR(ydb/core/actorlib_impl)
FORK_SUBTESTS()

IF (SANITIZER_TYPE == "thread")
TIMEOUT(2400)
SPLIT_FACTOR(20)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/backup/impl/ut_local_partition_reader/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ FORK_SUBTESTS()

SIZE(MEDIUM)

TIMEOUT(600)

PEERDIR(
library/cpp/testing/unittest
ydb/core/tx/replication/ut_helpers
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/backup/impl/ut_table_writer/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ FORK_SUBTESTS()

SIZE(MEDIUM)

TIMEOUT(600)

PEERDIR(
library/cpp/testing/unittest
ydb/core/tx/replication/ut_helpers
Expand Down
1 change: 0 additions & 1 deletion ydb/core/base/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
UNITTEST_FOR(ydb/core/base)

FORK_SUBTESTS()
TIMEOUT(600)
SIZE(MEDIUM)

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/base/ut_board_subscriber/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ FORK_SUBTESTS()

SIZE(MEDIUM)

TIMEOUT(600)

PEERDIR(
ydb/library/actors/interconnect
ydb/library/actors/core
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/backpressure/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ UNITTEST_FOR(ydb/core/blobstorage/backpressure)
FORK_SUBTESTS()

IF (WITH_VALGRIND)
TIMEOUT(1800)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/dsproxy/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ FORK_SUBTESTS(MODULO)
SPLIT_FACTOR(20)

IF (SANITIZER_TYPE)
TIMEOUT(3600)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/dsproxy/ut_fat/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@ SPLIT_FACTOR(30)
IF (WITH_VALGRIND)
SIZE(LARGE)
TAG(ya:fat)
TIMEOUT(1800)
ELSE()
SIZE(MEDIUM)
TIMEOUT(600)
ENDIF()

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/dsproxy/ut_ftol/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ FORK_SUBTESTS(MODULO)
SPLIT_FACTOR(24)

IF (SANITIZER_TYPE OR WITH_VALGRIND OR BUILD_TYPE == "DEBUG")
TIMEOUT(3600)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
1 change: 0 additions & 1 deletion ydb/core/blobstorage/dsproxy/ut_strategy/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ UNITTEST()

FORK_SUBTESTS()

TIMEOUT(600)
SIZE(MEDIUM)

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/groupinfo/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ UNITTEST_FOR(ydb/core/blobstorage/groupinfo)
FORK_SUBTESTS()

IF (WITH_VALGRIND)
TIMEOUT(1800)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/incrhuge/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ UNITTEST()
FORK_SUBTESTS()

IF (WITH_VALGRIND)
TIMEOUT(3600)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/nodewarden/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@ UNITTEST_FOR(ydb/core/blobstorage/nodewarden)
FORK_SUBTESTS()

IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
TIMEOUT(1200)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/nodewarden/ut_sequence/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ UNITTEST()

SIZE(MEDIUM)

TIMEOUT(600)

PEERDIR(
ydb/core/blobstorage/base
ydb/core/blobstorage/crypto
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/pdisk/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@ IF (WITH_VALGRIND)
ENDIF()

IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
TIMEOUT(2400)
SPLIT_FACTOR(20)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/storagepoolmon/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@ FORK_SUBTESTS()
SPLIT_FACTOR(20)

IF (SANITIZER_TYPE == "thread" OR WITH_VALGRIND)
TIMEOUT(3600)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_balancing/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ UNITTEST_FOR(ydb/core/blobstorage/ut_blobstorage)

FORK_SUBTESTS()

TIMEOUT(600)

SRCS(
balancing.cpp
)
Expand Down
1 change: 0 additions & 1 deletion ydb/core/blobstorage/ut_blobstorage/ut_blob_depot_fat/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
UNITTEST_FOR(ydb/core/blobstorage/ut_blobstorage)

TIMEOUT(3600)
SIZE(LARGE)
TAG(ya:fat)

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_donor/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ UNITTEST_FOR(ydb/core/blobstorage/ut_blobstorage)

SIZE(MEDIUM)

TIMEOUT(600)

SRCS(
donor.cpp
)
Expand Down
4 changes: 0 additions & 4 deletions ydb/core/blobstorage/ut_blobstorage/ut_group_reconfiguration/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@ FORK_SUBTESTS()

FORK_SUBTESTS()

# SIZE(MEDIUM)
# TIMEOUT(600)
SIZE(LARGE)

TIMEOUT(3600)

TAG(ya:fat)

SRCS(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_osiris/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ FORK_SUBTESTS()

SIZE(LARGE)

TIMEOUT(3600)

TAG(ya:fat)

SRCS(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_read_only_vdisk/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ UNITTEST_FOR(ydb/core/blobstorage/ut_blobstorage)

SIZE(MEDIUM)

TIMEOUT(600)

SRCS(
read_only_vdisk.cpp
)
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_replication/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ FORK_SUBTESTS()

SIZE(LARGE)

TIMEOUT(3600)

TAG(ya:fat)

SRCS(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_restart_pdisk/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ UNITTEST_FOR(ydb/core/blobstorage/ut_blobstorage)

SIZE(MEDIUM)

TIMEOUT(600)

SRCS(
restart_pdisk.cpp
)
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_scrub/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ FORK_SUBTESTS()

SIZE(LARGE)

TIMEOUT(3600)

TAG(ya:fat)

SRCS(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ut_vdisk_restart/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ UNITTEST_FOR(ydb/core/blobstorage/ut_blobstorage)

SIZE(MEDIUM)

TIMEOUT(600)

SRCS(
vdisk_restart.cpp
)
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_blobstorage/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ IF (SANITIZER_TYPE)
ENDIF()

IF (SANITIZER_TYPE OR WITH_VALGRIND)
TIMEOUT(3600)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_group/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,9 @@ IF (NOT WITH_VALGRIND)
ENDIF()

IF (SANITIZER_TYPE == "thread")
TIMEOUT(3600)
SIZE(LARGE)
TAG(ya:fat)
ELSE()
TIMEOUT(600)
SIZE(MEDIUM)
ENDIF()

Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_mirror3of4/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ SRCS(

SIZE(MEDIUM)

TIMEOUT(600)

PEERDIR(
ydb/apps/version
ydb/library/actors/interconnect/mock
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_pdiskfit/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
IF (OS_LINUX AND NOT WITH_VALGRIND)
UNITTEST()

TIMEOUT(1200)

SIZE(LARGE)

TAG(ya:fat)
Expand Down
1 change: 0 additions & 1 deletion ydb/core/blobstorage/ut_testshard/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
UNITTEST()

SIZE(MEDIUM)
TIMEOUT(600)

SRCS(
main.cpp
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/ut_vdisk/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ SPLIT_FACTOR(20)

SIZE(MEDIUM)

TIMEOUT(600)

SRCS(
defaults.h
gen_restarts.cpp
Expand Down
1 change: 0 additions & 1 deletion ydb/core/blobstorage/ut_vdisk2/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ UNITTEST()
FORK_SUBTESTS()

SIZE(MEDIUM)
TIMEOUT(600)

IF (SANITIZER_TYPE)
ENV(TIMEOUT=400)
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/vdisk/anubis_osiris/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ UNITTEST_FOR(ydb/core/blobstorage/vdisk/anubis_osiris)

FORK_SUBTESTS()

TIMEOUT(600)

SIZE(MEDIUM)

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/vdisk/common/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ UNITTEST_FOR(ydb/core/blobstorage/vdisk/common)

FORK_SUBTESTS()

TIMEOUT(600)

SIZE(MEDIUM)

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/vdisk/huge/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ UNITTEST_FOR(ydb/core/blobstorage/vdisk/huge)

FORK_SUBTESTS()

TIMEOUT(600)

SIZE(MEDIUM)

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/vdisk/hulldb/barriers/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ UNITTEST_FOR(ydb/core/blobstorage/vdisk/hulldb/barriers)

FORK_SUBTESTS()

TIMEOUT(600)

SIZE(MEDIUM)

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/vdisk/hulldb/base/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ UNITTEST_FOR(ydb/core/blobstorage/vdisk/hulldb/base)

FORK_SUBTESTS()

TIMEOUT(600)

SIZE(MEDIUM)

PEERDIR(
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/ya.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ UNITTEST_FOR(ydb/core/blobstorage/vdisk/hulldb/cache_block)

FORK_SUBTESTS()

TIMEOUT(600)

SIZE(MEDIUM)

PEERDIR(
Expand Down
Loading
Loading