[lxc-devel] [lxd/master] tests: Tweak fdleak test

[stgraber on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 354 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190202/e86db161/attachment.bin>
-------------- next part --------------
From 7c6f325dd726a76741775d7c3f1889c73897e0fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Graber?= <stgraber at ubuntu.com>
Date: Sat, 2 Feb 2019 23:41:51 +0100
Subject: [PATCH] tests: Tweak fdleak test
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
---
 test/suites/fdleak.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/suites/fdleak.sh b/test/suites/fdleak.sh
index fd6702d925..5beb6d270e 100644
--- a/test/suites/fdleak.sh
+++ b/test/suites/fdleak.sh
@@ -22,12 +22,17 @@ test_fdleak() {
     done
 
     lxc list
-    sleep 5
 
     exit 0
   )
-  afterfds=$(/bin/ls "/proc/${pid}/fd" | wc -l)
-  leakedfds=$((afterfds - beforefds))
+
+  for i in $(seq 10); do
+    afterfds=$(/bin/ls "/proc/${pid}/fd" | wc -l)
+    leakedfds=$((afterfds - beforefds))
+
+    [ "${leakedfds}" -gt 5 ] || break
+    sleep 1
+  done
 
   bad=0
   # shellcheck disable=SC2015