fix testsuite: setup periodic dumps config correctly

Before this PR, periodic dumps were not disabled in testsuite, unless `testsuite-support.testsuite-periodic-dumps-enabled: $userver-dumps-periodic` was set explicitly.
alexiprof · Nov 16, 2023 · 1a77eb9 · 1a77eb9
1 parent 88b942c
commit 1a77eb9
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 11 deletions.
diff --git a/core/functional_tests/cache_update/static_config.yaml b/core/functional_tests/cache_update/static_config.yaml
@@ -130,7 +130,6 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
         testsuite-support:
-            testsuite-periodic-dumps-enabled: $userver-dumps-periodic
         sample-cache:
             update-types: full-and-incremental
             full-update-interval: 1h

diff --git a/core/functional_tests/metrics/static_config.yaml b/core/functional_tests/metrics/static_config.yaml
@@ -131,7 +131,6 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
         testsuite-support:
-            testsuite-periodic-dumps-enabled: $userver-dumps-periodic
         sample-cache:
             update-types: full-and-incremental
             full-update-interval: 1h

diff --git a/core/functional_tests/uctl/static_config.yaml b/core/functional_tests/uctl/static_config.yaml
@@ -131,7 +131,6 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
         testsuite-support:
-            testsuite-periodic-dumps-enabled: $userver-dumps-periodic
     coro_pool:
         initial_size: $coro-pool-initial-size
         initial_size#fallback: 5000

diff --git a/core/src/cache/lru_cache_component_base_test.cpp b/core/src/cache/lru_cache_component_base_test.cpp
@@ -38,13 +38,6 @@ constexpr std::string_view kStaticConfig = R"(
         default:
           file_path: '@null'
     testsuite-support:
-      testsuite-periodic-update-enabled: true
-      testsuite-pg-execute-timeout: 300ms
-      testsuite-pg-statement-timeout: 300ms
-      testsuite-pg-readonly-master-expected: false
-      testsuite-redis-timeout-connect: 5s
-      testsuite-redis-timeout-single: 1s
-      testsuite-redis-timeout-all: 750ms
 )";
 
 void ValidateExampleCacheConfig(const formats::yaml::Value& static_config) {

diff --git a/samples/production_service/static_config.yaml b/samples/production_service/static_config.yaml
@@ -172,7 +172,6 @@ components_manager:
             testpoint-url: $mockserver/testpoint
             throttling_enabled: false
         testsuite-support:
-            testsuite-periodic-dumps-enabled: $userver-dumps-periodic
     coro_pool:
         initial_size: $coro-pool-initial-size
         initial_size#fallback: 5000

diff --git a/testsuite/pytest_plugins/pytest_userver/plugins/config.py b/testsuite/pytest_plugins/pytest_userver/plugins/config.py
@@ -415,6 +415,9 @@ def patch_config(config, config_vars) -> None:
         if not service_runner:
             _disable_cache_periodic_update(testsuite_support)
         testsuite_support['testsuite-tasks-enabled'] = not service_runner
+        testsuite_support[
+            'testsuite-periodic-dumps-enabled'
+        ] = '$userver-dumps-periodic'
         components['testsuite-support'] = testsuite_support
 
     return patch_config