From: Eric Mei <eric.mei@oracle.com>
Date: Tue, 21 Sep 2010 14:37:57 +0000 (+0400)
Subject: b=23728 fix regression in wait_flavor.
X-Git-Tag: 2.0.53.0~47
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=741229ebf7312fa72631f4b265d22b0b0904929d

b=23728 fix regression in wait_flavor.

i=jian.yu
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 61409d4..84534a2 100644
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -4154,16 +4154,11 @@ wait_flavor()
     local res=0
 
     for ((i=0;i<20;i++)); do
-        echo -n "checking..."
+        echo -n "checking $dir..."
         res=$(do_check_flavor $dir $flavor)
-        if [ $res -eq $expect ]; then
-            echo "found $res $flavor connections of $dir, OK"
-            return 0
-        else
-            echo "found $res $flavor connections of $dir, not ready ($expect)"
-            return 0
-            sleep 4
-        fi
+        echo "found $res/$expect $flavor connections"
+        [ $res -eq $expect ] && return 0
+        sleep 4
     done
 
     echo "Error checking $flavor of $dir: expect $expect, actual $res"