From ec46dac93a935624befca38e6ed69e081d971a01 Mon Sep 17 00:00:00 2001 From: Arnaud Rebillout Date: Thu, 6 Mar 2025 10:54:05 +0700 Subject: [PATCH 39/43] Fix flaky hardlinks test The test was added in dc34990, it turns out that it's flaky. It failed once on the Debian build infra, cf. [1]. The problem is that the command `rsync -aH '$fromdir/sym' '$todir'` updates the mod time of `$todir`, so there might be a diff between the output of `rsync_ls_lR $fromdir` and `rsync_ls_lR $todir`, if ever rsync runs 1 second (or more) after the directories were created. To clarify: it's easy to make the test fails 100% of the times with this change: ``` makepath "$fromdir/sym" "$todir" +sleep 5 checkit "$RSYNC -aH '$fromdir/sym' '$todir'" "$fromdir" "$todir" ``` With the fix proposed here, we don't use `checkit` anymore, instead we just run the rsync command, then a simple `diff` to compare the two directories. This is exactly what the other `-H` test just above does. In case there's some doubts, `diff` fails if `sym` is missing: ``` $ mkdir -p foo/sym bar $ diff foo bar || echo KO! Only in foo: sym KO! ``` I tested that, after this commit, the test still catches the `-H` regression in rsync 3.4.0. Fixes: https://github.com/RsyncProject/rsync/issues/735 [1]: https://buildd.debian.org/status/fetch.php?pkg=rsync&arch=ppc64el&ver=3.4.1%2Bds1-1&stamp=1741147156&raw=0 --- testsuite/hardlinks.test | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Index: rsync-3.3.0/testsuite/hardlinks.test =================================================================== --- rsync-3.3.0.orig/testsuite/hardlinks.test +++ rsync-3.3.0/testsuite/hardlinks.test @@ -77,5 +77,12 @@ rm -rf "$todir" $RSYNC -aHivv --debug=HLINK5 "$name1" "$todir/" diff $diffopt "$name1" "$todir" || test_fail "solo copy of name1 failed" +# Make sure there's nothing wrong with sending a single directory with -H +# enabled (this has broken in 3.4.0 so far, so we need this test). +rm -rf "$fromdir" "$todir" +makepath "$fromdir/sym" "$todir" +$RSYNC -aH "$fromdir/sym" "$todir" +diff $diffopt "$fromdir" "$todir" || test_fail "solo copy of sym failed" + # The script would have aborted on error, so getting here means we've won. exit 0