averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-01 18:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pt/t7527-flake-workaround' into next

Browse Source 
Test fixup.

* pt/t7527-flake-workaround:
  t7527: fix flaky fsmonitor event tests with retry logic
This commit is contained in:
Junio C Hamano
2026-02-27 15:16:29 -08:00
parent ebd1da8b75 cd607431e1
commit d6ebc97cb1
1 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
t/t7527-builtin-fsmonitor.sh
View File

@@ -408,9 +408,8 @@ move_directory() {
# ensure we are getting the OS notifications and do not try to confirm what
# is reported by `git status`.
#
# We run a simple query after modifying the filesystem just to introduce
# a bit of a delay so that the trace logging from the daemon has time to
# get flushed to disk.
# We use retry_grep to handle races between the daemon writing events
# to the trace file and our check.
#
# We `reset` and `clean` at the bottom of each test (and before stopping the
# daemon) because these commands might implicitly restart the daemon.
@@ -422,6 +421,24 @@ clean_up_repo_and_stop_daemon () {
rm -f .git/trace
}
# Retry a grep up to RETRY_TIMEOUT times until it succeeds.
#
RETRY_TIMEOUT=5
retry_grep () {
nr_tries_left=$RETRY_TIMEOUT
until grep "$1" "$2" 2>/dev/null
do
if test $nr_tries_left -eq 0
then
grep "$1" "$2"
return
fi
nr_tries_left=$(($nr_tries_left - 1))
sleep 1
done
}
test_expect_success 'edit some files' '
test_when_finished clean_up_repo_and_stop_daemon &&
@@ -429,12 +446,10 @@ test_expect_success 'edit some files' '
edit_files &&
test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/modified$" .git/trace &&
grep "^event: dir2/modified$" .git/trace &&
grep "^event: modified$" .git/trace &&
grep "^event: dir1/untracked$" .git/trace
retry_grep "^event: dir1/modified$" .git/trace &&
retry_grep "^event: dir2/modified$" .git/trace &&
retry_grep "^event: modified$" .git/trace &&
retry_grep "^event: dir1/untracked$" .git/trace
'
test_expect_success 'create some files' '
@@ -444,11 +459,9 @@ test_expect_success 'create some files' '
create_files &&
test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/new$" .git/trace &&
grep "^event: dir2/new$" .git/trace &&
grep "^event: new$" .git/trace
retry_grep "^event: dir1/new$" .git/trace &&
retry_grep "^event: dir2/new$" .git/trace &&
retry_grep "^event: new$" .git/trace
'
test_expect_success 'delete some files' '
@@ -458,11 +471,9 @@ test_expect_success 'delete some files' '
delete_files &&
test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/delete$" .git/trace &&
grep "^event: dir2/delete$" .git/trace &&
grep "^event: delete$" .git/trace
retry_grep "^event: dir1/delete$" .git/trace &&
retry_grep "^event: dir2/delete$" .git/trace &&
retry_grep "^event: delete$" .git/trace
'
test_expect_success 'rename some files' '
@@ -472,14 +483,12 @@ test_expect_success 'rename some files' '
rename_files &&
test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1/rename$" .git/trace &&
grep "^event: dir2/rename$" .git/trace &&
grep "^event: rename$" .git/trace &&
grep "^event: dir1/renamed$" .git/trace &&
grep "^event: dir2/renamed$" .git/trace &&
grep "^event: renamed$" .git/trace
retry_grep "^event: dir1/rename$" .git/trace &&
retry_grep "^event: dir2/rename$" .git/trace &&
retry_grep "^event: rename$" .git/trace &&
retry_grep "^event: dir1/renamed$" .git/trace &&
retry_grep "^event: dir2/renamed$" .git/trace &&
retry_grep "^event: renamed$" .git/trace
'
test_expect_success 'rename directory' '
@@ -489,10 +498,8 @@ test_expect_success 'rename directory' '
mv dirtorename dirrenamed &&
test-tool fsmonitor-client query --token 0 &&
grep "^event: dirtorename/*$" .git/trace &&
grep "^event: dirrenamed/*$" .git/trace
retry_grep "^event: dirtorename/*$" .git/trace &&
retry_grep "^event: dirrenamed/*$" .git/trace
'
test_expect_success 'file changes to directory' '
@@ -502,10 +509,8 @@ test_expect_success 'file changes to directory' '
file_to_directory &&
test-tool fsmonitor-client query --token 0 &&
grep "^event: delete$" .git/trace &&
grep "^event: delete/new$" .git/trace
retry_grep "^event: delete$" .git/trace &&
retry_grep "^event: delete/new$" .git/trace
'
test_expect_success 'directory changes to a file' '
@@ -515,9 +520,7 @@ test_expect_success 'directory changes to a file' '
directory_to_file &&
test-tool fsmonitor-client query --token 0 &&
grep "^event: dir1$" .git/trace
retry_grep "^event: dir1$" .git/trace
'
# The next few test cases exercise the token-resync code. When filesystem