From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pve-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id BD4681FF172 for <inbox@lore.proxmox.com>; Tue, 1 Apr 2025 15:15:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6D95F32304; Tue, 1 Apr 2025 15:15:27 +0200 (CEST) Message-ID: <bf26e451-0771-49c3-9ea7-2064c0a9835b@proxmox.com> Date: Tue, 1 Apr 2025 15:15:23 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>, Christoph Heiss <c.heiss@proxmox.com> References: <20250327151718.1084841-1-c.heiss@proxmox.com> <20250327151718.1084841-7-c.heiss@proxmox.com> Content-Language: en-US From: Daniel Kral <d.kral@proxmox.com> In-Reply-To: <20250327151718.1084841-7-c.heiss@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [proxmox.com, parse-answer.rs, utils.rs, answer.rs, main.rs] Subject: Re: [pve-devel] [PATCH installer 6/6] fix #5811: auto: add option to retrieve FQDN from DHCP configuration X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com> Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com> On 3/27/25 16:17, Christoph Heiss wrote: > The test suite is extended quite a bit, to cover all the different > cases. > > [0] https://bugzilla.proxmox.com/show_bug.cgi?id=5811 > > Signed-off-by: Christoph Heiss <c.heiss@proxmox.com> > --- > proxmox-auto-installer/src/answer.rs | 36 +++++++++++++++++- > proxmox-auto-installer/src/utils.rs | 37 ++++++++++++++++--- > proxmox-auto-installer/tests/parse-answer.rs | 8 ++++ > .../parse_answer/fqdn_from_dhcp.json | 19 ++++++++++ > .../parse_answer/fqdn_from_dhcp.toml | 14 +++++++ > ...cp_no_dhcp_domain_with_default_domain.json | 19 ++++++++++ > ...cp_no_dhcp_domain_with_default_domain.toml | 17 +++++++++ > ...ll_fqdn_from_dhcp_with_default_domain.json | 19 ++++++++++ > ...ll_fqdn_from_dhcp_with_default_domain.toml | 17 +++++++++ > .../fqdn_from_dhcp_no_default_domain.json | 3 ++ > ...n_from_dhcp_no_default_domain.run-env.json | 1 + > .../fqdn_from_dhcp_no_default_domain.toml | 14 +++++++ > .../parse_answer_fail/fqdn_hostname_only.json | 3 ++ > .../parse_answer_fail/fqdn_hostname_only.toml | 14 +++++++ > .../parse_answer_fail/no_fqdn_from_dhcp.json | 3 ++ > .../no_fqdn_from_dhcp.run-env.json | 1 + > .../parse_answer_fail/no_fqdn_from_dhcp.toml | 14 +++++++ > .../tests/resources/run-env-info.json | 2 +- > proxmox-post-hook/src/main.rs | 19 ++++++++-- > 19 files changed, 250 insertions(+), 10 deletions(-) Just tried to apply this, and it seems like the diff for the JSON files is malformed as it splits the changes at roughly 1000 characters for the changes to run-env*.json files: * run-env-info.json * no_fqdn_from_dhcp.run-env.json * fqdn_from_dhcp_no_default_domain.run-env.json I'm not sure what could have caused this, but after manually fixing this, the rest of the patch applies cleanly and the tests run fine. _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel