From 62a2a7004baefb2e8bc391e721daffb6806485d7 Mon Sep 17 00:00:00 2001 From: Yang Sheng Date: Fri, 18 Apr 2014 11:49:52 +0800 Subject: [PATCH] LU-3227 tests: fix for acl test acl permission test will failed by a wrong system message. Change script to adapt this issue. Combined with other small change for lprocfs. Signed-off-by: Yang Sheng Change-Id: I42d1e02c0f0990500b02085d60e2dc47f93f1bcc Reviewed-on: http://review.whamcloud.com/10007 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Jian Yu Reviewed-by: Oleg Drokin --- lustre/obdclass/lprocfs_status.c | 2 +- lustre/tests/acl/permissions.test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c index 8b8effa..938cb7a 100644 --- a/lustre/obdclass/lprocfs_status.c +++ b/lustre/obdclass/lprocfs_status.c @@ -3328,7 +3328,7 @@ int lprocfs_recovery_status_seq_show(struct seq_file *m, void *data) LASSERT(obd != NULL); - seq_printf(m, "status: \n"); + seq_printf(m, "status: "); if (obd->obd_max_recoverable_clients == 0) { seq_printf(m, "INACTIVE\n"); goto out; diff --git a/lustre/tests/acl/permissions.test b/lustre/tests/acl/permissions.test index 04accac..a7ca8e0 100644 --- a/lustre/tests/acl/permissions.test +++ b/lustre/tests/acl/permissions.test @@ -205,8 +205,8 @@ although it pass in FC2. commented out by CFS (agreed with HP) Replaced "echo" with "touch" can resolve such problem. # $ echo i > e/i # > e/i: Permission denied - $ touch e/i - > touch: cannot touch `e/i': Permission denied + $ touch e/i 2>&1 | sed -e "s/\\`/\\'/" + > touch: cannot touch 'e/i': Permission denied $ su $ setfacl -m u:bin:rwx e -- 1.8.3.1