26 lines
993 B
Diff
26 lines
993 B
Diff
From 3da691ba7ed23db37930dff5452fe3c3dcd9a963 Mon Sep 17 00:00:00 2001
|
|
From: Frantisek Sumsal <frantisek@sumsal.cz>
|
|
Date: Fri, 27 Jan 2023 14:29:42 +0100
|
|
Subject: [PATCH] test: don't hang indefinitely on no match
|
|
|
|
(cherry picked from commit 270e9dcdb8c7f0f3c8b56803d0ef7bbf867b9fd1)
|
|
|
|
Related: #2138081
|
|
---
|
|
test/units/testsuite-75.sh | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh
|
|
index d36cab2923..ddd86d09bb 100755
|
|
--- a/test/units/testsuite-75.sh
|
|
+++ b/test/units/testsuite-75.sh
|
|
@@ -41,7 +41,7 @@ monitor_check_rr() (
|
|
# displayed. We turn off pipefail for this, since we don't care about the
|
|
# lhs of this pipe expression, we only care about the rhs' result to be
|
|
# clean
|
|
- journalctl -u resmontest.service --since "$since" -f --full | grep -m1 "$match"
|
|
+ timeout -v 30s journalctl -u resmontest.service --since "$since" -f --full | grep -m1 "$match"
|
|
)
|
|
|
|
# Test for resolvectl, resolvconf
|