From e40a3fd8a531ed60528ca82e02ce41918b1be6ba Mon Sep 17 00:00:00 2001 From: Hongchao Zhang Date: Wed, 3 Feb 2016 22:34:39 +0800 Subject: [PATCH] LU-7428 test: remove test 84 from ALWAYS_EXCEPT Debug patch to remove the test 84 from ALWAYS_EXCEPT in conf-sanity temporarily to verify the problem is really fixed. Test-Parameters: trivial testlist=conf-sanity,conf-sanity,conf-sanity,conf-sanity Test-Parameters: testlist=conf-sanity,conf-sanity,conf-sanity,conf-sanity Change-Id: I1d2dd16f33f0713a5e11d243708865b45ec283cb Signed-off-by: Hongchao Zhang Reviewed-on: http://review.whamcloud.com/20194 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Nunez Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 4 ++-- lustre/tests/test-framework.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index a795457..24ab71e 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -4,8 +4,8 @@ set -e ONLY=${ONLY:-"$*"} -# bug number for skipped test: LU-7428 -ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT 84" +# bug number for skipped test: +ALWAYS_EXCEPT="$CONF_SANITY_EXCEPT" # UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! is_sles11() # LU-2181 diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index a9097c1..8478fec 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -1345,7 +1345,9 @@ mount_facet() { # commit the device label change to disk if [[ $devicelabel =~ (:[a-zA-Z]{3}[0-9]{4}) ]]; then + echo "Commit the device label on ${!dev}" do_facet $facet "sync; sync; sync" + sleep 5 fi -- 1.8.3.1