From c54810ea3dab6dd9468312e46f4270c29d50be01 Mon Sep 17 00:00:00 2001
From: Max Tropets <maxtropets@gmail.com>
Date: Tue, 14 Jan 2025 13:29:54 +0000
Subject: [PATCH] More timeout for suites

---
 .github/workflows/long-test.yml | 7 +++++++
 CMakeLists.txt                  | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/long-test.yml b/.github/workflows/long-test.yml
index a5b692ab86f..3ed0d4faa84 100644
--- a/.github/workflows/long-test.yml
+++ b/.github/workflows/long-test.yml
@@ -150,6 +150,9 @@ jobs:
             build/workspace/*.ledger/*
           if-no-files-found: ignore
 
+  # All e2e tests without sanitizers in debug mode; needed because:
+  # - Sanitizer builds may slightly differ.
+  # - Test durations may also differ, which is important for -L "suite" because they have fixed timeouts.
   long-e2e-debug:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
     name: Long E2E - all (Debug)
@@ -195,6 +198,7 @@ jobs:
             build/workspace/*.ledger/*
           if-no-files-found: ignore
 
+  # All e2e tests in release mode (same as release build).
   long-e2e-release:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
     name: Long E2E - all (Release)
@@ -233,6 +237,7 @@ jobs:
             build/workspace/*.ledger/*
           if-no-files-found: ignore
 
+  # End-to-end test suites with shuffling enabled.
   e2e-suite-shuffled:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
     name: Long E2E suite (Shuffled)
@@ -271,6 +276,8 @@ jobs:
             build/workspace/*.ledger/*
           if-no-files-found: ignore
 
+  # All end-to-end tests in debug mode on Azure Linux (except benchmarks and tests which are not supported yet).
+  # The main purpose of these is to keep the Azure Linux build/run up-to-date to facilitate an easy migration in the future.
   long-azure-linux:
     if: ${{ contains(github.event.pull_request.labels.*.name, 'run-long-test') || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule'}}
     name: "Azure Linux Long Test"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ef7454928f..1fc4cae12ef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -987,7 +987,7 @@ if(BUILD_TESTS)
       LABEL suite
       ADDITIONAL_ARGS
         --test-duration
-        150
+        300
         --test-suite
         rekey_recovery
         --test-suite
@@ -1001,7 +1001,7 @@ if(BUILD_TESTS)
       PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/e2e_suite.py
       LABEL suite
       ADDITIONAL_ARGS
-        --test-duration 200 --test-suite reconfiguration --jinja-templates-path
+        --test-duration 300 --test-suite reconfiguration --jinja-templates-path
         ${CMAKE_SOURCE_DIR}/samples/templates
     )
 
@@ -1010,7 +1010,7 @@ if(BUILD_TESTS)
         NAME regression_test_suite
         PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/e2e_suite.py
         LABEL suite
-        ADDITIONAL_ARGS --test-duration 200 --test-suite regression_5236
+        ADDITIONAL_ARGS --test-duration 300 --test-suite regression_5236
       )
     endif()
 
@@ -1024,7 +1024,7 @@ if(BUILD_TESTS)
         --ledger-recovery-timeout
         20
         --test-duration
-        200
+        300
         --test-suite
         all
         --jinja-templates-path