From patchwork Wed Mar 27 07:45:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zorro Lang X-Patchwork-Id: 10872831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AD0DD1575 for ; Wed, 27 Mar 2019 07:45:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8A59828C0C for ; Wed, 27 Mar 2019 07:45:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6577B28C1E; Wed, 27 Mar 2019 07:45:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0675A28C0C for ; Wed, 27 Mar 2019 07:45:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725827AbfC0HpQ (ORCPT ); Wed, 27 Mar 2019 03:45:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38680 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725772AbfC0HpQ (ORCPT ); Wed, 27 Mar 2019 03:45:16 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2FFAD309267E for ; Wed, 27 Mar 2019 07:45:16 +0000 (UTC) Received: from dhcp-12-125.nay.redhat.com (dhcp-12-125.nay.redhat.com [10.66.12.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5520917586 for ; Wed, 27 Mar 2019 07:45:15 +0000 (UTC) From: Zorro Lang To: fstests@vger.kernel.org Subject: [PATCH] xfs/065: make sure SCRATCH_DEV is unmount before mkfs Date: Wed, 27 Mar 2019 15:45:09 +0800 Message-Id: <20190327074509.27770-1-zlang@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 27 Mar 2019 07:45:16 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit "8309b39a fstests: fix broken _require_scratch usage" did below change on xfs/065: -_scratch_unmount 2>/dev/null +_scratch_mkfs_xfs >> $seqres.full It cause xfs/065 always fails now, as: QA output created by 065 mkfs.xfs: /dev/sdb2 contains a mounted filesystem ... So use _require_scratch, to make sure the SCRATCH_DEV is unmounted before mkfs. Signed-off-by: Zorro Lang Reviewed-by: Darrick J. Wong --- tests/xfs/065 | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/xfs/065 b/tests/xfs/065 index c0d1ee93..f09bd947 100755 --- a/tests/xfs/065 +++ b/tests/xfs/065 @@ -50,6 +50,7 @@ _list_dir() # real QA test starts here _supported_fs xfs _supported_os Linux +_require_scratch # # too much hassle to get output matching with quotas turned on