From 7a001525850fc60d24be019e4fba726d3c33ee5e Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Wed, 27 May 2015 08:45:52 +0530 Subject: tests: arbiter.t fix Backport of http://review.gluster.org/10833 Wait for AFR's children to be up in glustershd process before attempting heal. Also, grep (version 2.21) is detecting statedump files as binary, causing tests to succeed incorrectly. Hence adding the -a switch to force it to treat it as a text file. Thanks to Vijay Bellur for identifying the issue (http://lists.gnu.org/archive/html/bug-grep/2015-05/msg00000.html) and the workaround. Change-Id: Ie3d9591ffaf44baa0cd8c2baa327aed24378e3df BUG: 1225077 BUG: Reviewed-on: http://review.gluster.org/10833 Tested-by: Niels de Vos Tested-by: Gluster Build System Reviewed-by: Pranith Kumar Karampuri (cherry picked from commit b51ee5f8d1f80d66effffc06c1e49099c04014a4) Signed-off-by: Ravishankar N Reviewed-on: http://review.gluster.org/10923 Tested-by: NetBSD Build System Reviewed-by: Vijay Bellur --- run-tests.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'run-tests.sh') diff --git a/run-tests.sh b/run-tests.sh index 4b026490c4f..2d1191ae0d7 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -199,7 +199,6 @@ function is_bad_test () ./tests/bugs/replicate/bug-976800.t \ ./tests/bugs/replicate/bug-1015990.t \ ./tests/bugs/quota/bug-1038598.t \ - ./tests/basic/afr/arbiter.t \ ./tests/basic/afr/read-subvol-entry.t \ ./tests/basic/ec/quota.t \ ./tests/bugs/distribute/bug-1161156.t \ -- cgit