Skip to content

Commit 47de54b

Browse files
committed
bug redis: increase redis start timeout
commit_hash:468b9917f37ce98bddb099163216929185eabc28
1 parent 4102c3a commit 47de54b

File tree

9 files changed

+14
-7
lines changed

9 files changed

+14
-7
lines changed

redis/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ userver_module(
1010
UTEST_LINK_LIBRARIES ${PROJECT_NAME}-utest
1111
DBTEST_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/*_redistest.cpp"
1212
DBTEST_DATABASES redis redis-cluster
13+
DBTEST_ENV REDIS_SLEEP_WORKAROUND_SECONDS=120
1314
UBENCH_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/benchmark"
1415
UBENCH_DATABASES redis
1516
DEPENDS core

redis/functional_tests/CMakeLists.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@ project(userver-redis-tests CXX)
22

33
add_custom_target(${PROJECT_NAME})
44

5+
function(userver_chaos_testsuite_add_redis)
6+
userver_chaos_testsuite_add(
7+
ENV REDIS_SLEEP_WORKAROUND_SECONDS=120
8+
)
9+
endfunction()
10+
511
add_subdirectory(basic_chaos)
612
add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}-basic-chaos)
713

redis/functional_tests/basic_chaos/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ project(userver-redis-tests-basic-chaos CXX)
33
add_executable(${PROJECT_NAME} "redis_service.cpp")
44
target_link_libraries(${PROJECT_NAME} userver::core userver::redis)
55

6-
userver_chaos_testsuite_add()
6+
userver_chaos_testsuite_add_redis()

redis/functional_tests/cluster_auto_topology/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ project(userver-redis-tests-cluster-auto-topology CXX)
33
add_executable(${PROJECT_NAME} "redis_service.cpp")
44
target_link_libraries(${PROJECT_NAME} userver::redis)
55

6-
userver_chaos_testsuite_add()
6+
userver_chaos_testsuite_add_redis()

redis/functional_tests/cluster_auto_topology_pubsub/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ project(userver-redis-tests-pubsub CXX)
33
add_executable(${PROJECT_NAME} "redis_service.cpp")
44
target_link_libraries(${PROJECT_NAME} userver::redis)
55

6-
userver_chaos_testsuite_add()
6+
userver_chaos_testsuite_add_redis()

redis/functional_tests/database_index/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ project(userver-redis-tests-database-index CXX)
33
add_executable(${PROJECT_NAME} "redis_service.cpp")
44
target_link_libraries(${PROJECT_NAME} userver::core userver::redis)
55

6-
userver_chaos_testsuite_add()
6+
userver_chaos_testsuite_add_redis()

redis/functional_tests/integration_tests/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ project(userver-redis-tests-integration CXX)
33
add_executable(${PROJECT_NAME} "redis_service.cpp")
44
target_link_libraries(${PROJECT_NAME} userver::core userver::redis)
55

6-
userver_chaos_testsuite_add()
6+
userver_chaos_testsuite_add_redis()

redis/functional_tests/metrics/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ project(userver-redis-tests-metrics CXX)
33
add_executable(${PROJECT_NAME} "redis_service.cpp")
44
target_link_libraries(${PROJECT_NAME} userver::redis)
55

6-
userver_chaos_testsuite_add()
6+
userver_chaos_testsuite_add_redis()

redis/functional_tests/pubsub/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ project(userver-redis-tests-pubsub CXX)
33
add_executable(${PROJECT_NAME} "redis_service.cpp")
44
target_link_libraries(${PROJECT_NAME} userver::redis)
55

6-
userver_chaos_testsuite_add()
6+
userver_chaos_testsuite_add_redis()

0 commit comments

Comments
 (0)