diff --git a/debian/changelog b/debian/changelog index b9351ed99f199f78fb4b57b7e0eedebb7e0ec1ca..d861f36a6f998c1625d045e81c7b43a9dacff99c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +fence-agents (4.7.1-2) UNRELEASED; urgency=medium + + * d/t/delay: Reduce minimum delay when running on ppc64el + + -- Sergio Durigan Junior Tue, 02 Mar 2021 14:42:21 -0500 + fence-agents (4.7.1-1) unstable; urgency=medium * New upstream version 4.7.1 diff --git a/debian/tests/delay b/debian/tests/delay index ad0af03cce48d30ada6f7829139a4e1280aac4c3..1ad534fe46f2f4599672070908910a74b94f8d49 100755 --- a/debian/tests/delay +++ b/debian/tests/delay @@ -6,6 +6,12 @@ DEFAULT_ARGS='delay=10\n login=test\n passwd=test\n ipaddr=127.0.0.1\n port=1\n OUTPUT=$AUTOPKGTEST_TMP/delay mkdir -p $OUTPUT +if [ "$(dpkg --print-architecture)" = "ppc64el" ]; then + MIN_DELAY=500 +else + MIN_DELAY=1000 +fi + for agent in /usr/sbin/fence_*; do [ "$agent" = "/usr/sbin/fence_ack_manual" ] && continue [ "$agent" = "/usr/sbin/fence_kdump" ] && continue @@ -18,7 +24,7 @@ for agent in /usr/sbin/fence_*; do ( TIME=$(/usr/bin/time -p sh -c "printf '$ARGS' | $agent " 2>&1 | awk -F"[. ]" -vOFS= '/real/ {print $2,$3}') - if [ "$TIME" -lt 1000 ]; then + if [ "$TIME" -lt "$MIN_DELAY" ]; then echo "$agent delay too low: $TIME" | tee $LOG else echo "$agent delay ok: $TIME" | tee $LOG