From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 02DE55BEEA for ; Wed, 8 Jul 2020 14:59:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F23E3A5D3 for ; Wed, 8 Jul 2020 14:59:21 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 20E00A5A4 for ; Wed, 8 Jul 2020 14:59:20 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C95AC44468 for ; Wed, 8 Jul 2020 14:59:19 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 8 Jul 2020 14:59:16 +0200 Message-Id: <20200708125919.3622-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200708125919.3622-1-d.csapak@proxmox.com> References: <20200708125919.3622-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup 2/5] zpool_list: add tests for special pool names X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2020 12:59:22 -0000 those names are allowed for zpools these will fail for now, but it will be fixed in the next commit Signed-off-by: Dominik Csapak --- src/tools/disks/zpool_list.rs | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/src/tools/disks/zpool_list.rs b/src/tools/disks/zpool_list.rs index 3c65280..343ac0d 100644 --- a/src/tools/disks/zpool_list.rs +++ b/src/tools/disks/zpool_list.rs @@ -221,7 +221,7 @@ logs assert_eq!(data, expect); let output = "\ -btest 427349245952 761856 427348484096 - - 0 0 1.00 ONLINE - +b-test 427349245952 761856 427348484096 - - 0 0 1.00 ONLINE - mirror 213674622976 438272 213674184704 - - 0 0 - ONLINE /dev/sda1 - - - - - - - - ONLINE /dev/sda2 - - - - - - - - ONLINE @@ -235,7 +235,7 @@ logs - - - - - - - - - let data = parse_zpool_list(&output)?; let expect = vec![ ZFSPoolInfo { - name: String::from("btest"), + name: String::from("b-test"), health: String::from("ONLINE"), usage: Some(ZFSPoolUsage { size: 427349245952, @@ -261,5 +261,31 @@ logs - - - - - - - - - assert_eq!(data, expect); + let output = "\ +b.test 427349245952 761856 427348484096 - - 0 0 1.00 ONLINE - + mirror 213674622976 438272 213674184704 - - 0 0 - ONLINE + /dev/sda1 - - - - - - - - ONLINE +"; + + let data = parse_zpool_list(&output)?; + let expect = vec![ + ZFSPoolInfo { + name: String::from("b.test"), + health: String::from("ONLINE"), + usage: Some(ZFSPoolUsage { + size: 427349245952, + alloc: 761856, + free: 427348484096, + dedup: 1.0, + frag: 0, + }), + devices: vec![ + String::from("/dev/sda1"), + ] + }, + ]; + + assert_eq!(data, expect); + Ok(()) } -- 2.20.1