# HG changeset patch # User Pierre-Yves David # Date 1580544876 -3600 # Node ID 141ceec06b55b99139cfa871ddb086709ace296e # Parent 9659ec1616446461c11e33d4f0a29a977b86a1a9 test: simplify test-amend.t to avoid race condition Insted on relying on sleep, we could simply have the editor do the file change. This remove the reliance on "sleep" and avoid test failing on heavy load machine. To test this, I reverted the code change in 5558e3437872 and the test started failing again. Differential Revision: https://phab.mercurial-scm.org/D8065 diff -r 9659ec161644 -r 141ceec06b55 tests/test-amend.t --- a/tests/test-amend.t Fri Dec 13 11:32:36 2019 +0100 +++ b/tests/test-amend.t Sat Feb 01 09:14:36 2020 +0100 @@ -485,14 +485,14 @@ $ echo r0 > foo; hg commit -qAm "r0" $ echo alpha > foo; hg commit -qm "alpha" $ echo beta >> foo - $ cat > $TESTTMP/sleepy_editor.sh < $TESTTMP/touchy_editor.sh < sleep 1 + > echo delta >> $TESTTMP/modify-during-amend/foo + > sleep 1 > echo hi > "\$1" - > sleep 3 + > sleep 1 > EOF - $ HGEDITOR="sh $TESTTMP/sleepy_editor.sh" hg commit --amend & - $ sleep 1 - $ echo delta >> foo - $ sleep 3 + $ HGEDITOR="sh $TESTTMP/touchy_editor.sh" hg commit --amend $ if (hg diff -c . | grep 'delta' >/dev/null) || [ -n "$(hg status)" ]; then > echo "OK." > else