tests: Don't set DEBUGINFOD_TIMEOUT

Various tests set DEBUGINFOD_TIMEOUT to 10. Which is less than the default
of 90. None of the tests relied on a lower timeout. So just don't set it.

Signed-off-by: Mark Wielaard <mark@klomp.org>

diff --git a/tests/ChangeLog b/tests/ChangeLog
index a59cdd5144c0f82ee91eee3098dacf8206ef7ff7..26a4d6749d8ee9a09c457656f1f3ec60877a0d08 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,19 @@
+2021-11-11  Mark Wielaard  <mark@klomp.org>
+
+       * run-debuginfod-000-permission.sh: Don't set DEBUGINFOD_TIMEOUT.
+       * run-debuginfod-archive-groom.sh: Likewise.
+       * run-debuginfod-archive-rename.sh: Likewise.
+       * run-debuginfod-archive-test.sh: Likewise.
+       * run-debuginfod-artifact-running.sh: Likewise.
+       * run-debuginfod-dlopen.sh: Likewise.
+       * run-debuginfod-extraction.sh: Likewise.
+       * run-debuginfod-federation-link.sh: Likewise.
+       * run-debuginfod-federation-metrics.sh: Likewise.
+       * run-debuginfod-federation-sqlite.sh: Likewise.
+       * run-debuginfod-malformed.sh: Likewise.
+       * run-debuginfod-tmp-home.sh: Likewise.
+       * run-debuginfod-writable.sh: Likewise.
+
 2021-11-05  Frank Ch. Eigler  <fche@redhat.com>
 
        PR28430

diff --git a/tests/run-debuginfod-000-permission.sh b/tests/run-debuginfod-000-permission.sh
index c1b2cf813f83e317eded65967e78cf9f3e332cd2..1f46c34199bb58e5ad4838420621b052af85e4fa 100755 (executable)
--- a/tests/run-debuginfod-000-permission.sh
+++ b/tests/run-debuginfod-000-permission.sh
@@ -37,9 +37,6 @@ errfiles vlog$PORT1
 wait_ready $PORT1 'ready' 1
 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/   # or without trailing /
 
-# Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
-
 # Check thread comm names
 ps -q $PID1 -e -L -o '%p %c %a' | grep groom
 ps -q $PID1 -e -L -o '%p %c %a' | grep scan

diff --git a/tests/run-debuginfod-archive-groom.sh b/tests/run-debuginfod-archive-groom.sh
index 030e0aa62de46149605da0f06427361d64a847d3..e2c394efd2bcd5fe5ed38bcb189aa19a1948e147 100755 (executable)
--- a/tests/run-debuginfod-archive-groom.sh
+++ b/tests/run-debuginfod-archive-groom.sh
@@ -28,7 +28,6 @@ get_ports
 DB=${PWD}/.debuginfod_tmp.sqlite
 tempfiles $DB
 export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache
-export DEBUGINFOD_TIMEOUT=10
 
 # Clean old dirictories
 mkdir R ${PWD}/F

diff --git a/tests/run-debuginfod-archive-rename.sh b/tests/run-debuginfod-archive-rename.sh
index 5369949bac120fe043392cbdda279d257fcd6e8c..a1a6cc1e5c28ad3e916e0c1831d36a286edf3496 100755 (executable)
--- a/tests/run-debuginfod-archive-rename.sh
+++ b/tests/run-debuginfod-archive-rename.sh
@@ -27,7 +27,6 @@ base=8200
 get_ports
 DB=${PWD}/.debuginfod_tmp.sqlite
 export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache
-export DEBUGINFOD_TIMEOUT=10
 tempfiles $DEBUGINFOD_CACHE_PATH $DB
 # Clean old dirictories
 mkdir R ${PWD}/F

diff --git a/tests/run-debuginfod-archive-test.sh b/tests/run-debuginfod-archive-test.sh
index 9f7454bcc47956d06dc4f2c4766aede02298d751..5f24ea71a6850665af7e2e1ca7e1bf405b4aeacc 100755 (executable)
--- a/tests/run-debuginfod-archive-test.sh
+++ b/tests/run-debuginfod-archive-test.sh
@@ -42,7 +42,6 @@ wait_ready $PORT1 'ready' 1
 wait_ready $PORT1 'thread_work_total{role="traverse"}' 1
 
 # Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
 export DEBUGINFOD_URLS='http://127.0.0.1:'$PORT1
 
 # Check thread comm names

diff --git a/tests/run-debuginfod-artifact-running.sh b/tests/run-debuginfod-artifact-running.sh
index b94444267ade22d909c1184aa32b60134fea7f93..8b9aed37fa120799886e4dd953da01bc0e4c41fe 100755 (executable)
--- a/tests/run-debuginfod-artifact-running.sh
+++ b/tests/run-debuginfod-artifact-running.sh
@@ -53,9 +53,6 @@ mv prog F
 mv prog.debug F
 tempfiles prog/F
 
-# Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
-
 kill -USR1 $PID1
 wait_ready $PORT1 'thread_work_total{role="traverse"}' 2
 wait_ready $PORT1 'thread_work_pending{role="scan"}' 0

diff --git a/tests/run-debuginfod-dlopen.sh b/tests/run-debuginfod-dlopen.sh
index 39ee5190bbfccdeba3cc14281630726c6709d806..7279b02e38137d08716c372a45d7abcd10b03b21 100755 (executable)
--- a/tests/run-debuginfod-dlopen.sh
+++ b/tests/run-debuginfod-dlopen.sh
@@ -42,9 +42,6 @@ errfiles vlog$PORT1
 wait_ready $PORT1 'ready' 1
 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/   # or without trailing /
 
-# Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
-
 # Check thread comm names
 ps -q $PID1 -e -L -o '%p %c %a'
 ps -q $PID1 -e -L -o '%p %c %a' | grep groom

diff --git a/tests/run-debuginfod-extraction.sh b/tests/run-debuginfod-extraction.sh
index 06f60e78e4fc0a93b5962d81ae2bfd0bae6cd7f9..a3722c90d218e3edcccf2575a25123653840a252 100755 (executable)
--- a/tests/run-debuginfod-extraction.sh
+++ b/tests/run-debuginfod-extraction.sh
@@ -39,9 +39,6 @@ errfiles vlog$PORT1
 # Server must become ready
 wait_ready $PORT1 'ready' 1
 
-# Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
-
 # Check thread comm names
 ps -q $PID1 -e -L -o '%p %c %a' | grep groom
 ps -q $PID1 -e -L -o '%p %c %a' | grep scan

diff --git a/tests/run-debuginfod-federation-link.sh b/tests/run-debuginfod-federation-link.sh
index 1347e7b8cc215d31a2dcee363e028f8d29713a6b..4f043741bc2af5c23b6506dae8d353e362705eb6 100755 (executable)
--- a/tests/run-debuginfod-federation-link.sh
+++ b/tests/run-debuginfod-federation-link.sh
@@ -24,7 +24,6 @@ unset VALGRIND_CMD
 
 DB=${PWD}/.debuginfod_tmp.sqlite
 export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache
-export DEBUGINFOD_TIMEOUT=10
 tempfiles $DB
 
 # Clean old dirictories

diff --git a/tests/run-debuginfod-federation-metrics.sh b/tests/run-debuginfod-federation-metrics.sh
index 2d0fd6d42c1f551a4d49f1894f662944cc0f526e..3da457e8b42036cbd91ef41192a7fe98fef96bf1 100755 (executable)
--- a/tests/run-debuginfod-federation-metrics.sh
+++ b/tests/run-debuginfod-federation-metrics.sh
@@ -24,7 +24,6 @@ unset VALGRIND_CMD
 
 DB=${PWD}/.debuginfod_tmp.sqlite
 export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache
-export DEBUGINFOD_TIMEOUT=10
 export DEBUGINFOD_URLS='http://127.0.0.1:0' # Note invalid, will trigger error_count metric
 tempfiles $DB
 # Clean old dirictories

diff --git a/tests/run-debuginfod-federation-sqlite.sh b/tests/run-debuginfod-federation-sqlite.sh
index 45761ed73dff4109c09fda805e040bffea4278f4..449df5dbec240d8a0d75b13c2f6480eb8f409320 100755 (executable)
--- a/tests/run-debuginfod-federation-sqlite.sh
+++ b/tests/run-debuginfod-federation-sqlite.sh
@@ -24,7 +24,6 @@ unset VALGRIND_CMD
 
 DB=${PWD}/.debuginfod_tmp.sqlite
 export DEBUGINFOD_CACHE_PATH=${PWD}/.client_cache
-export DEBUGINFOD_TIMEOUT=10
 tempfiles $DB
 
 # Clean old dirictories

diff --git a/tests/run-debuginfod-malformed.sh b/tests/run-debuginfod-malformed.sh
index 3bc9e7995844d431e9e9cc6d564dde5cf9aad8d3..83e6a3a957ee3d78b76ec2de8b03908dafe06349 100755 (executable)
--- a/tests/run-debuginfod-malformed.sh
+++ b/tests/run-debuginfod-malformed.sh
@@ -45,9 +45,6 @@ wait_ready $PORT1 'thread_work_total{role="traverse"}' 1
 
 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/   # or without trailing /
 
-# Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
-
 # Check thread comm names
 ps -q $PID1 -e -L -o '%p %c %a' | grep groom
 ps -q $PID1 -e -L -o '%p %c %a' | grep scan

diff --git a/tests/run-debuginfod-tmp-home.sh b/tests/run-debuginfod-tmp-home.sh
index dc9accb06cc8910895fb933c9064d4df8c202d7d..4256f6f28a91b95997c6ce986afa8a7405f81d92 100755 (executable)
--- a/tests/run-debuginfod-tmp-home.sh
+++ b/tests/run-debuginfod-tmp-home.sh
@@ -45,9 +45,6 @@ wait_ready $PORT1 'thread_work_total{role="traverse"}' 1
 
 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/   # or without trailing /
 
-# Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
-
 # Check thread comm names
 ps -q $PID1 -e -L -o '%p %c %a' | grep groom
 ps -q $PID1 -e -L -o '%p %c %a' | grep scan

diff --git a/tests/run-debuginfod-writable.sh b/tests/run-debuginfod-writable.sh
index 9cc4ea1db92c8f08608dfd716955660df4645720..c521a5723132f29ebbbdaeb9ef253ac1d837cc56 100755 (executable)
--- a/tests/run-debuginfod-writable.sh
+++ b/tests/run-debuginfod-writable.sh
@@ -44,9 +44,6 @@ wait_ready $PORT1 'thread_work_total{role="traverse"}' 1
 
 export DEBUGINFOD_URLS=http://127.0.0.1:$PORT1/   # or without trailing /
 
-# Be patient when run on a busy machine things might take a bit.
-export DEBUGINFOD_TIMEOUT=10
-
 # Check thread comm names
 ps -q $PID1 -e -L -o '%p %c %a' | grep groom
 ps -q $PID1 -e -L -o '%p %c %a' | grep scan