From patchwork Thu Jun 6 11:39:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Thumshirn X-Patchwork-Id: 10979383 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 280716C5 for ; Thu, 6 Jun 2019 11:39:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 156E4288E5 for ; Thu, 6 Jun 2019 11:39:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 098EB288E8; Thu, 6 Jun 2019 11:39:13 +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 8663D288B3 for ; Thu, 6 Jun 2019 11:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727064AbfFFLjM (ORCPT ); Thu, 6 Jun 2019 07:39:12 -0400 Received: from mx2.suse.de ([195.135.220.15]:40806 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726877AbfFFLjM (ORCPT ); Thu, 6 Jun 2019 07:39:12 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 00ECEAEFC; Thu, 6 Jun 2019 11:39:11 +0000 (UTC) From: Johannes Thumshirn To: Eryu Guan , Filipe Manana Cc: Linux BTRFS Mailinglist , fstests@vger.kernel.org, Johannes Thumshirn Subject: [PATCH fstests v2] btrfs: add validation of compression options to btrfs/048 Date: Thu, 6 Jun 2019 13:39:07 +0200 Message-Id: <20190606113907.17551-1-jthumshirn@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The current btrfs/048 test-case did not check the behavior of properties with options like compression and with the compression level supplied. Add test cases for compression with compression level as well so we can be sure we don't regress there. Signed-off-by: Johannes Thumshirn Reviewed-by: Filipe Manana --- Changes to v1: - Removed output redirection and filtering for the cases we don't expect any actual output (Filipe) --- tests/btrfs/048 | 15 +++++++++++++++ tests/btrfs/048.out | 12 ++++++++++++ 2 files changed, 27 insertions(+) diff --git a/tests/btrfs/048 b/tests/btrfs/048 index 8bb10a904bc9..04df3ed98ff7 100755 --- a/tests/btrfs/048 +++ b/tests/btrfs/048 @@ -226,5 +226,20 @@ $BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz' 2>&1 | _filter_scrat $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT $BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV | grep '^generation' +echo -e "\nTesting argument validation with options" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lzo:9' +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zlib:3' +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zstd:0' +echo "***" + +echo -e "\nTesting invalid argument validation with options, should fail" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz:9' 2>&1 | _filter_scratch +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zli:0' 2>&1 | _filter_scratch +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zst:3' 2>&1 | _filter_scratch + status=0 exit diff --git a/tests/btrfs/048.out b/tests/btrfs/048.out index 16a785a642f7..016eba265b01 100644 --- a/tests/btrfs/048.out +++ b/tests/btrfs/048.out @@ -92,3 +92,15 @@ Testing generation is unchanged after failed validation generation 7 ERROR: failed to set compression for SCRATCH_MNT: Invalid argument generation 7 + +Testing argument validation with options +*** +*** +*** + +Testing invalid argument validation with options, should fail +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument +*** +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument +*** +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument