From: Lai Siyao <laisiyao@whamcloud.com>
Date: Thu, 12 May 2011 06:25:05 +0000 (-0700)
Subject: LU-231 sanity test_170: FAIL: expected 248 bad lines, but got 249
X-Git-Tag: 2.0.61.0~1
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=847836235678b8c86117b05db7f10cf2ebb36262;p=fs%2Flustre-release.git

LU-231 sanity test_170: FAIL: expected 248 bad lines, but got 249

Port b1_8 fix to master:
Short malformed line may not be counted into bad lines.

Signed-off-by: Lai Siyao <laisiyao@whamcloud.com>
Change-Id: Iebf8b48b775a9cb393caa854e51aaf9981e08d0f
Reviewed-on: http://review.whamcloud.com/537
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
index 4e747ee..6b2cbdc 100644
--- a/lustre/tests/sanity.sh
+++ b/lustre/tests/sanity.sh
@@ -7346,7 +7346,9 @@ test_170() {
         local expected_good=$((good_line1 + good_line2*2))
 
         rm -f $TMP/${tfile}*
-        if [ $bad_line -ne $bad_line_new ]; then
+	# LU-231, short malformed line may not be counted into bad lines
+        if [ $bad_line -ne $bad_line_new ] &&
+		   [ $bad_line -ne $((bad_line_new - 1)) ]; then
                 error "expected $bad_line bad lines, but got $bad_line_new"
                 return 1
         fi