mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-11 19:00:02 +01:00
Set higher timeout for interactive tests.
Under heavy load 10 seconds is not enough, just use the same values as when running under valgrind.
This commit is contained in:
@@ -840,8 +840,7 @@ command -v expect >/dev/null || skip "WARNING: expect tool missing, interactive
|
||||
|
||||
prepare "[32] Interactive password retry from terminal." new
|
||||
EXPECT_DEV=$(losetup $LOOPDEV | sed -e "s/.*(\(.*\))/\1/")
|
||||
EXPECT_TIMEOUT=10
|
||||
[ -n "$VALG" ] && EXPECT_TIMEOUT=60
|
||||
EXPECT_TIMEOUT=60
|
||||
|
||||
expect_run - >/dev/null <<EOF
|
||||
proc abort {} { send_error "Timeout. "; exit 2 }
|
||||
|
||||
@@ -155,8 +155,7 @@ function img_check_fail()
|
||||
|
||||
function img_run_reenc_ok()
|
||||
{
|
||||
local EXPECT_TIMEOUT=10
|
||||
[ -n "$VALG" ] && EXPECT_TIMEOUT=60
|
||||
local EXPECT_TIMEOUT=60
|
||||
# For now, we cannot run reencryption in batch mode for non-block device. Just fake the terminal here.
|
||||
expect_run - >/dev/null <<EOF
|
||||
proc abort {} { send_error "Timeout. "; exit 2 }
|
||||
@@ -172,8 +171,7 @@ EOF
|
||||
|
||||
function img_run_reenc_fail()
|
||||
{
|
||||
local EXPECT_TIMEOUT=10
|
||||
[ -n "$VALG" ] && EXPECT_TIMEOUT=60
|
||||
local EXPECT_TIMEOUT=60
|
||||
# For now, we cannot run reencryption in batch mode for non-block device. Just fake the terminal here.
|
||||
expect_run - >/dev/null <<EOF
|
||||
proc abort {} { send_error "Timeout. "; exit 42 }
|
||||
|
||||
Reference in New Issue
Block a user