From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 9 May 2026 10:35:50 +0000 (+0100)
Subject: tests: Add a sleep to try to make tests more reliable
X-Git-Tag: debian/1.3.3~6^2
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=0c56e4d9f633328ac37c75d67d5201c03094279a;p=hippotat.git

tests: Add a sleep to try to make tests more reliable

Hopefully it will avoid this kind of thing (seen in ci.debian.net):

  101s + fuser -Mkm /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay
  101s /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay:  2659rce  2661rce  2699rce  2742rce  2772rce  2775rce  2777rce  2778rce  2779rce  2780rce  2781rce  2782rce
  101s + umount /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay/proc
  101s umount: /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay/proc: target is busy.
  101s + :
  101s + umount /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay/dev
  101s umount: /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay/dev: target is busy.
  101s + :
  101s + umount /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay/home
  101s /tmp/autopkgtest.lrleaj/build.Yox/src/adt/../test/tcommon: line 51:  2741 Killed                     $exec ip netns exec hippotat-t-$tname-$client_server "$@"
  101s + umount /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay
  101s umount: /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay: target is busy.
  101s + :
  101s + umount /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-pidns
  101s + test -d /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay
  101s + rmdir /tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay
  101s rmdir: failed to remove '/tmp/autopkgtest.lrleaj/autopkgtest_tmp/server-overlay': Device or resource busy
  101s /tmp/autopkgtest.lrleaj/build.Yox/src/adt/adt-full: line 1:  2529 Killed                     unshare --fork --pid="$tmp"/$cs-pidns chroot "$tmp"/$cs-overlay sh -ec '
  ...

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/adt/acommon b/adt/acommon
index 2d5934a..606d3b5 100644
--- a/adt/acommon
+++ b/adt/acommon
@@ -112,6 +112,7 @@ hosts-cleanup () {
 host-cleanup () {
     cs=$1; shift
     fuser -Mkm "$tmp"/$cs-overlay ||:
+    sleep 1 # apparently fs's can still be busy even after kill(2) returns
     umount "$tmp"/$cs-overlay/proc ||:
     umount "$tmp"/$cs-overlay/dev ||:
     umount "$tmp"/$cs-overlay/home ||: