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 0DBAE6491C for ; Wed, 30 Dec 2020 12:37:04 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EB93720C39 for ; Wed, 30 Dec 2020 12:36:33 +0100 (CET) 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 7D50520C2F for ; Wed, 30 Dec 2020 12:36:33 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3DB47446C4 for ; Wed, 30 Dec 2020 12:36:33 +0100 (CET) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Cc: Wolfgang Bumiller Date: Wed, 30 Dec 2020 12:36:23 +0100 Message-Id: <20201230113623.431025-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.024 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment 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_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] applied: [PATCH proxmox-backup] verify-api: fix allOf duplicates check 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, 30 Dec 2020 11:37:04 -0000 it triggered with a wrongly-formatted message on schemas that did NOT contain any duplicates.. Signed-off-by: Fabian Grünbichler --- Note: we are still lacking the same checks for CLI handlers and their schema.. tests/verify-api.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/verify-api.rs b/tests/verify-api.rs index 7b7371f6..83a26a21 100644 --- a/tests/verify-api.rs +++ b/tests/verify-api.rs @@ -46,8 +46,8 @@ fn verify_all_of_schema(schema: &AllOfSchema) -> Result<(), Error> { let mut keys = HashSet::<&'static str>::new(); let mut dupes = String::new(); for property in schema.properties() { - if keys.insert(property.0) { - if dupes.is_empty() { + if !keys.insert(property.0) { + if !dupes.is_empty() { dupes.push_str(", "); } dupes.push_str(property.0); -- 2.20.1