From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UGgQLQek6WF2YwEAgWs5BA (envelope-from ) for ; Thu, 20 Jan 2022 19:03:51 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id UH+wKgek6WEsPgEA9RJhRA (envelope-from ) for ; Thu, 20 Jan 2022 19:03:51 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 3EDBC3CB3C for ; Thu, 20 Jan 2022 19:03:51 +0100 (CET) Received: from localhost ([::1]:44618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nAbmo-0000Lt-DQ for larch@yhetil.org; Thu, 20 Jan 2022 13:03:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nAXCX-0004EL-At for guix-patches@gnu.org; Thu, 20 Jan 2022 08:10:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nAXCW-0006UP-Ks for guix-patches@gnu.org; Thu, 20 Jan 2022 08:10:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nAXCW-0004tO-GA for guix-patches@gnu.org; Thu, 20 Jan 2022 08:10:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53389] [PATCH 9/9] tests/challenge: Do not hard code HTTP ports. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 20 Jan 2022 13:10:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53389 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53389@debbugs.gnu.org Cc: ludo@gnu.org, Maxime Devos Received: via spool by 53389-submit@debbugs.gnu.org id=B53389.164268415918702 (code B ref 53389); Thu, 20 Jan 2022 13:10:04 +0000 Received: (at 53389) by debbugs.gnu.org; 20 Jan 2022 13:09:19 +0000 Received: from localhost ([127.0.0.1]:56704 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXBn-0004rU-2u for submit@debbugs.gnu.org; Thu, 20 Jan 2022 08:09:19 -0500 Received: from baptiste.telenet-ops.be ([195.130.132.51]:42104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nAXBN-0004p1-0b for 53389@debbugs.gnu.org; Thu, 20 Jan 2022 08:08:55 -0500 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by baptiste.telenet-ops.be with bizsmtp id l18q2600H4UW6Th0118sP7; Thu, 20 Jan 2022 14:08:52 +0100 From: Maxime Devos Date: Thu, 20 Jan 2022 13:08:49 +0000 Message-Id: <20220120130849.292178-9-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220120130849.292178-1-maximedevos@telenet.be> References: <20220120130849.292178-1-maximedevos@telenet.be> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1642684132; bh=QOnbiZkDGAC6xGcsNPZP8KQQOf8C713hLl+2UHDyN8s=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hHzl58paTOa3m80X/OlSozvUm7INhCPR2YKK18EdRzb+nKZH9giYVNwx0eXN8ykkT PYhG4PGu/tO1aKD7s01s3TbYT0mYRcES2ThGYCelh9ev2zTKINuJNOXQh4ORrf6nAu rdd8jio+eKi+jfMsY7bjKFDgP8YzmNH4SGDcOl9QCGEMCsNFNmhoHieLxt6DJjpz6Y /DrIyh70V6896YJsPr4MLfoG2H93XyN2IK908U8yPpmwX3acCWmJbkvMwaxGKZxVLw DxWgp0Q4iYtbM/WiMkr/J52C4SiRumvu8CscOqk2vB7RgoVbv+Mt85JlmsyyPMXgFb rFpMkta8ZJJ6Q== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642701831; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=QOnbiZkDGAC6xGcsNPZP8KQQOf8C713hLl+2UHDyN8s=; b=D0LjRSQLym4D3syTLVtFPFn0Wo75VrmDjNZnfcJPZGKBfBSryElwsfUz7kHTunTfFFB0Ol EOzlgTbuWU4d0wcE+8DpEbUEYVYqXccW/So0tMs0yVJ8uQ+O3Kpo/i6uyL9eimf0FTa7mz FkWLLDkz1EGQbQ2D52/Y3JAGi9Z/+/LuMqSQDRPrV2TcWBTwNj9vnKjGE4F0w1CZFGzgxS 1jujY66Q3d1EFwVG8AB7pgQUtkvKQkz8R8OU5mkfhXsnQiokW+ExU9ePYOXvvVnsnbfzO1 U3WAJO2juLdHEMHLb1xJJuq5Lk5/nE+YKIh7ee2zwPEqUDvAXER1CXG6olFjyw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642701831; a=rsa-sha256; cv=none; b=rPUnYwghBuUf8fFa8rPBQSoBcUp5iZCRKKl7CuDsHr/jyS5ouqD9xcXj3Xwuqo+m+afYV9 JtIMLYgadYwUzJ1IpBzicafiiMv+P4eIsipWgf5dICyO2dB3ch4IRLdSocW5bKBnXoUH03 mzaYuBBtZK/7Eudf8w1V5rMMNCVdKdNQF5D7QE3KwRGQx5ykHbrDPikXAImaG6/dSbv7fn x3hQb+8HZUKP6rLoKYbGxi1j8QokYHtj//v/Cj+WuWRBoawKL9ZwQXtD4t2BTibf1oYMF0 MrZjFNFU8nm61yLi7v2h8ZxLcRV05wWiT22vYsGd3vaTkmgpLXD3Ypj6XzhF2Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=hHzl58pa; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=telenet.be header.s=r22 header.b=hHzl58pa; dmarc=fail reason="SPF not aligned (relaxed)" header.from=telenet.be (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 3EDBC3CB3C X-Spam-Score: -1.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: JS8kLL7rfP+Q This is a follow-up to commit 4aea90b1876179aab8d603a42533a6bdf97ccd3c. * tests/challenge.scm (call-mismatch-test): Set %http-server-port to 0 instead of 9001. Remove the first parametrisation of %http-server-port as it was unnecessary. Adjust calls to %local-url to use the right port number. --- tests/challenge.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/challenge.scm b/tests/challenge.scm index c9de33ed34..2807b4fa00 100644 --- a/tests/challenge.scm +++ b/tests/challenge.scm @@ -198,16 +198,16 @@ value." (nar2 -> (call-with-bytevector-output-port (lambda (port) (write-file out2 port))))) - (parameterize ((%http-server-port 9000)) - (with-http-server/keep-lingering - `((200 ,(make-narinfo item size1 hash1)) - (200 ,nar1)) - (parameterize ((%http-server-port 9001)) + (with-http-server/keep-lingering + `((200 ,(make-narinfo item size1 hash1)) + (200 ,nar1)) + (let ((port1 (%http-server-port))) + (parameterize ((%http-server-port 0)) (with-http-server/keep-lingering `((200 ,(make-narinfo item size2 hash2)) (200 ,nar2)) - (mlet* %store-monad ((urls -> (list (%local-url 9000) - (%local-url 9001))) + (mlet* %store-monad ((urls -> (list (%local-url port1) + (%local-url))) (reports (compare-contents (list item) urls))) (return (proc (car reports)))))))))))) -- 2.30.2