Buildbot failure in Wildebeest Builder on whole buildset

[Mark Wielaard]

On Mon, 2020-02-10 at 22:34 +0000, buildbot@builder.wildebeest.org
wrote:
> The Buildbot has detected a failed build on builder whole buildset
> while building elfutils.
> Full details are available at:
>     https://builder.wildebeest.org/buildbot/#builders/15/builds/269

This is a somewhat older failure and newer ones did show all green.
I didn't see the fix being posted to the list, so just for the record
here it is:

commit 990955ef0a320a73ed583246f23d5f220e5916f8
Author: Frank Ch. Eigler <fche@redhat.com>
Date:   Mon Feb 10 14:33:54 2020 -0500

    debuginfod testing: SIGUSR2 vs "groom" metric synch
    
    Previous code did not account for a groom job that was already
    completed at startup, so the SIGUSR2-triggered one may not have
    completed in time for the test.  The shell won the race condition on
    most buildbot VMs, but a debian builder showed the error of our ways.
    
    Signed-off-by: Frank Ch. Eigler <fche@redhat.com>

diff --git a/tests/run-debuginfod-find.sh b/tests/run-debuginfod-find.sh
index 939826cd..1cc8f406 100755
--- a/tests/run-debuginfod-find.sh
+++ b/tests/run-debuginfod-find.sh
@@ -269,7 +269,8 @@ RPM_BUILDID=d44d42cbd7d915bc938c81333a21e355a6022fb7 # in rhel6/ subdir, for a l
 rm -r R/debuginfod-rpms/rhel6/*
 kill -USR2 $PID1  # groom cycle
 # Expect 3 rpms to be deleted by the groom
-wait_ready $PORT1 'thread_work_total{role="groom"}' 1
+# 1 groom already took place at/soon-after startup, so -USR2 makes 2
+wait_ready $PORT1 'thread_work_total{role="groom"}' 2
 wait_ready $PORT1 'groom{statistic="file d/e"}' 3
 
 rm -rf $DEBUGINFOD_CACHE_PATH # clean it from previous tests