On Sun, Nov 25, 2018 at 10:01:38PM +0000, Thomas Gummerer wrote: > On 11/25, Torsten Bögershausen wrote: > > After running the "Git 2.20-rc1" testsuite here on a raspi, > > the only TC that failed was t5570. > > When the "grep" was run on daemon.log, the file was empty (?). > > When inspecting it later, it was filled, and grep would have found > > the "extended.attribute" it was looking for. > > I believe this has been reported before in > https://public-inbox.org/git/1522783990.964448.1325338528.0D49CC15@xxxxxxxxxxxxxxxxxxxxxxxxxxx/, > but it seems like the thread never ended with actually fixing it. > Reading the first reply Peff seemed to be fine with just removing the > test completely, which would be the easiest solution ;) Adding him to > Cc: here. Yes, I don't think there is a way to make this race-proof without somehow convincing "cat" to flush (and let us know when it has). Which really implies killing the daemon, and wait()ing on cat to process the EOF and exit. And that makes the tests a lot more expensive if we have to start the daemon for each snippet. So I'm still fine with just dropping this test. > > diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh > > index 7466aad111..e259fee0ed 100755 > > --- a/t/t5570-git-daemon.sh > > +++ b/t/t5570-git-daemon.sh > > @@ -192,6 +192,7 @@ test_expect_success 'daemon log records all attributes' ' > > GIT_OVERRIDE_VIRTUAL_HOST=localhost \ > > git -c protocol.version=1 \ > > ls-remote "$GIT_DAEMON_URL/interp.git" && > > + sleep 1 && > > grep -i extended.attribute daemon.log | cut -d" " -f2- >actual && > > test_cmp expect actual > > ' > > ---------------- > > A slightly better approach may be to use a "sleep on demand": > > > > + ( grep -i -q extended.attribute daemon.log || sleep 1 ) && That doesn't really fix it, but just broadens the race window. I dunno. Maybe that is enough in practice. We could do something like: repeat_with_timeout () { local i=0 while test $i -lt 10 do "$@" && return 0 sleep 1 done # no success even after 10 seconds return 1 } repeat_with_timeout grep -i extended.attribute daemon.log to make the pattern a bit more obvious (and make it easy to extend the window arbitrarily; surely 10s is enough?). -Peff
