Merge pull request #3237 from IntersectMBO/add_default_timeout

fix(clusterlib): set default timeout to 120s in run_cli

Author: mkoura

.github/run_tests.sh

@@ -21,7 +21,7 @@
 #   DESELECT_FROM_FILE: path to file with tests to deselect
 #   CLUSTERS_COUNT: number of local testnet clusters to launch
 #   FORBID_RESTART: if set to 1, do not restart clusters between tests
-#   SESSION_TIMEOUT: overall timeout for the test session (e.g. 10800 for 3 hours)
+#   SESSION_TIMEOUT: timeout for the test session (e.g. 3h for 3 hours)
 #
 # Notes:
 # - If PYTEST_ARGS is provided, we disable cleanup and the initial "skip all" pass.
@@ -164,44 +164,44 @@ ensure_markexpr_default() {
 target_tests() {
   export DbSyncAbortOnPanic="${DbSyncAbortOnPanic:-1}"
   TEST_THREADS="${TEST_THREADS:-20}"
-  SESSION_TIMEOUT="${SESSION_TIMEOUT:-10800}"
+  SESSION_TIMEOUT="${SESSION_TIMEOUT:-3h}"
 
   ensure_dirs
   set_common_env
   compute_common_args
   cleanup_previous_run
   initial_skip_pass
-  run_real_tests --timeout=7200 "$@"
+  run_real_tests "$@"
 }
 
 target_testpr() {
   export TESTPR=1
   export CLUSTERS_COUNT="${CLUSTERS_COUNT:-5}"
   TEST_THREADS="${TEST_THREADS:-20}"
-  SESSION_TIMEOUT="${SESSION_TIMEOUT:-2700}"
+  SESSION_TIMEOUT="${SESSION_TIMEOUT:-45m}"
   ensure_markexpr_default "smoke"
 
   ensure_dirs
   set_common_env
   compute_common_args
   cleanup_previous_run
   initial_skip_pass
-  run_real_tests --timeout=1200 "$@"
+  run_real_tests "$@"
 }
 
 target_testnets() {
   export CLUSTERS_COUNT=1
   export FORBID_RESTART=1
   TEST_THREADS="${TEST_THREADS:-15}"
-  SESSION_TIMEOUT="${SESSION_TIMEOUT:-72000}"
+  SESSION_TIMEOUT="${SESSION_TIMEOUT:-20h}"
   ensure_markexpr_default "testnets"
 
   ensure_dirs
   set_common_env
   compute_common_args
   cleanup_previous_run
   initial_skip_pass
-  run_real_tests --timeout=7200 "$@"
+  run_real_tests "$@"
 }
 
 # Dispatch

cardano_node_tests/utils/custom_clusterlib.py

@@ -96,6 +96,10 @@ def cli(
         Returns:
             clusterlib.CLIOut: A data container containing command stdout and stderr.
         """
+        # Set a default timeout. This is a change of behavior compared to the base class!
+        if timeout is None:
+            timeout = 120
+
         cli_args_strs_all = [str(arg) for arg in cli_args]
         if add_default_args:
             cli_args_strs_all.insert(0, "cardano-cli")

poetry.lock

@@ -43,7 +43,6 @@ PyYAML = "^6.0.2"
 requests = "^2.32.4"
 pytest-subtests = "^0.14.2"
 cardonnay = "^0.2.8"
-pytest-timeout = "^2.4.0"
 
 [tool.poetry.group.dev]
 optional = true