From patchwork Mon Jan 11 11:32:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 8002601 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D0943BEEE5 for ; Mon, 11 Jan 2016 11:32:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F1225202D1 for ; Mon, 11 Jan 2016 11:32:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE593202B8 for ; Mon, 11 Jan 2016 11:32:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759699AbcAKLc3 (ORCPT ); Mon, 11 Jan 2016 06:32:29 -0500 Received: from mx1.redhat.com ([209.132.183.28]:35307 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759395AbcAKLc2 (ORCPT ); Mon, 11 Jan 2016 06:32:28 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id AE9EF13933 for ; Mon, 11 Jan 2016 11:32:28 +0000 (UTC) Received: from localhost (dhcp-13-211.nay.redhat.com [10.66.13.211]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0BBWPfB004483; Mon, 11 Jan 2016 06:32:27 -0500 From: Eryu Guan To: fstests@vger.kernel.org Cc: Eryu Guan Subject: [PATCH 1/3] generic/23[23]: some cleanups Date: Mon, 11 Jan 2016 19:32:02 +0800 Message-Id: <1452511924-21872-2-git-send-email-eguan@redhat.com> In-Reply-To: <1452511924-21872-1-git-send-email-eguan@redhat.com> References: <1452511924-21872-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,LOTS_OF_MONEY, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 1. remove $seqres.full before test 2. no need to check return values of _fsstress and _check_quota_usage calls, the golden image could catch the failures. 3. remove unused FSX related variables Signed-off-by: Eryu Guan --- tests/generic/232 | 17 ++++------------- tests/generic/233 | 20 ++++---------------- 2 files changed, 8 insertions(+), 29 deletions(-) diff --git a/tests/generic/232 b/tests/generic/232 index b3f6b7e..1323809 100755 --- a/tests/generic/232 +++ b/tests/generic/232 @@ -71,23 +71,14 @@ _require_scratch _require_quota _need_to_be_root -_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mkfs > $seqres.full 2>&1 _scratch_mount "-o usrquota,grpquota" chmod 777 $SCRATCH_MNT quotacheck -u -g $SCRATCH_MNT 2>/dev/null quotaon -u -g $SCRATCH_MNT 2>/dev/null -if ! _fsstress; then - _scratch_unmount 2>/dev/null - exit -fi - -if ! _check_quota_usage; then - _scratch_unmount 2>/dev/null - status=1 - exit -fi - -_scratch_unmount 2>/dev/null +_fsstress +_check_quota_usage +_scratch_unmount status=0 exit diff --git a/tests/generic/233 b/tests/generic/233 index 95255f8..d50d280 100755 --- a/tests/generic/233 +++ b/tests/generic/233 @@ -38,9 +38,6 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15 . ./common/filter . ./common/quota -FSX_FILE_SIZE=64000000 -FSX_ARGS="-q -l $FSX_FILE_SIZE -o 65536 -S 191110531 -N 100000" - _filter_num() { tee -a $seqres.full |\ @@ -79,24 +76,15 @@ _require_quota _require_user _need_to_be_root -_scratch_mkfs >> $seqres.full 2>&1 +_scratch_mkfs > $seqres.full 2>&1 _scratch_mount "-o usrquota,grpquota" chmod 777 $SCRATCH_MNT quotacheck -u -g $SCRATCH_MNT 2>/dev/null quotaon -u -g $SCRATCH_MNT 2>/dev/null setquota -u $qa_user 32000 32000 1000 1000 $SCRATCH_MNT 2>/dev/null -if ! _fsstress; then - _scratch_unmount 2>/dev/null - exit -fi - -if ! _check_quota_usage; then - _scratch_unmount 2>/dev/null - status=1 - exit -fi - -_scratch_unmount 2>/dev/null +_fsstress +_check_quota_usage +_scratch_unmount status=0 exit