From patchwork Fri Nov 17 12:16:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 56576 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 30CDA27BBE9; Fri, 17 Nov 2023 10:22:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0E3D327BBEA for ; Fri, 17 Nov 2023 10:22:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r3vyo-0001C2-MX; Fri, 17 Nov 2023 05:21:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r3vyR-0000yB-2Z for guix-patches@gnu.org; Fri, 17 Nov 2023 05:21:20 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r3vyQ-0005Eb-4J; Fri, 17 Nov 2023 05:21:18 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r3vyM-0001Ii-9T; Fri, 17 Nov 2023 05:21:14 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67237] [PATCH 28/32] gnu: python-pytest-socket: Enable tests. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 17 Nov 2023 10:21:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67237 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67237@debbugs.gnu.org Cc: Sharlatan Hellseher , Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , jgart Received: via spool by 67237-submit@debbugs.gnu.org id=B67237.17002164544659 (code B ref 67237); Fri, 17 Nov 2023 10:21:14 +0000 Received: (at 67237) by debbugs.gnu.org; 17 Nov 2023 10:20:54 +0000 Received: from localhost ([127.0.0.1]:45240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3vy1-0001Cy-Rw for submit@debbugs.gnu.org; Fri, 17 Nov 2023 05:20:54 -0500 Received: from mail-wr1-x42b.google.com ([2a00:1450:4864:20::42b]:52245) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r3vxn-00019i-QN for 67237@debbugs.gnu.org; Fri, 17 Nov 2023 05:20:40 -0500 Received: by mail-wr1-x42b.google.com with SMTP id ffacd0b85a97d-32f7abbb8b4so1181036f8f.0 for <67237@debbugs.gnu.org>; Fri, 17 Nov 2023 02:20:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700216434; x=1700821234; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=67rwh/1RjiFlLfuJ4/yujSv3S9OnqrzZKFPlCFzREaQ=; b=XQHCUQnqwfol3+OR6caJx2xpUWQomrG9Fy94yNHj+oHE+I8i3PDhntXlaLAmWcb3cu YNARltqh4Ib9d2LmEIfL4Rg22WkJMyb1we/dDuzQSVnytMb3qNDyEShIS1LZne2OG/O+ 2VldXbBedaoa3VTPh7j7CCSvWvvG6BIW0TTBC3SkHvB4P6jxKKP/fJsYQmXsJLCpRYmG ylet0yIQ2a3mYXCuldNVjNRXXJwNb0Uja4NhGiNxm2ZFNgLfPO/c3mD4J5Y1FWxgm8kR sMc3PaH9Rdzwp3jzuoJkG1jZKvTH6D9ZsfgSMG9ogXEX4w1KyLLvcQ0cQtDKqHsjdADQ N7ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700216434; x=1700821234; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=67rwh/1RjiFlLfuJ4/yujSv3S9OnqrzZKFPlCFzREaQ=; b=MmkNHV5C9ENIUED5gKc/uU+k1ICf5l1K2kx8+SnQf38UJ7fajjhhAdCPtHMNjWl+uP Wyu9nPgG/IcljAWQ/Dvg+le7xv/iE62IZXMFmzWIbF61IHMOi5+Rw2VhYJSoqBA+9D11 nSffcq0zmF1Kc5XY3Gyu4qxcb2jZufQ2Cb1gx0hjZ0fMhfJ7/10MJKIwH5ZWW1EkvlqC ZJ+s4A+0zwR3miQ+PMfZG0TYz4x80kFr9ODDwlO1mwK23xn9NGXLN2LXIe+ZJGMNDPt2 DqFqo2xUQPmjaxTlXGLzk+QYdSXpgsX+uJkAM9sBCLjmYcyFTODRWa3qYF6nPJ+mgdhj nKgA== X-Gm-Message-State: AOJu0Yy80HPqzx1PzMGuyf1zVoSIfdL/7A9s6zSCXXrZrB15OV2QBvdG BAEENh6AVv0//QT0B0IMlMGcWRQKp5B34Q== X-Google-Smtp-Source: AGHT+IGom7JT4nigT0Koy8OEKBnlxvF7gSZkpfnrtEn5QZ5WoUhLVZxguuCde3BBae7sXT3aBf5+7g== X-Received: by 2002:adf:9c93:0:b0:32f:9697:ec48 with SMTP id d19-20020adf9c93000000b0032f9697ec48mr4092571wre.23.1700216433875; Fri, 17 Nov 2023 02:20:33 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id t4-20020a5d4604000000b0032fbd0c7d04sm1858856wrq.55.2023.11.17.02.20.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 02:20:33 -0800 (PST) From: Sharlatan Hellseher Date: Fri, 17 Nov 2023 12:16:17 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/python-check.scm (python-pytest-socket): Improve package style, enable tests. [build-system]: Swap to pyproject-build-system. [arguments]{tests-flags}: Disable test requiring network access. {phases}: Swap to use standard phases. Change-Id: I7cdd98bc501caddc982bb5ffa21354e3987242f9 --- gnu/packages/python-check.scm | 38 +++++++++++++---------------------- 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/gnu/packages/python-check.scm b/gnu/packages/python-check.scm index e7de83539d..7412c04ce0 100644 --- a/gnu/packages/python-check.scm +++ b/gnu/packages/python-check.scm @@ -429,31 +429,21 @@ (define-public python-pytest-socket (sha256 (base32 "0f3irpd8lwmm3pb1fqnvwg82kpkhsnzsmw8jg7yd85c349kisg1n")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - ;; FIXME: Tests fail a lot, probably requiring Internet access. - (list #:tests? #f - #:phases #~(modify-phases %standard-phases - (replace 'build - (lambda _ - (setenv "SETUPTOOLS_SCM_PRETEND_VERSION" - #$version) - (setenv "SOURCE_DATE_EPOCH" "315532800") - (invoke "python" - "-m" - "build" - "--wheel" - "--no-isolation" - "."))) - (add-before 'check 'disable-unsupported-test - (lambda _ - (substitute* "tests/test_async.py" - (("def test_asynctest") - "def __off_test_asynctest")))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - (invoke "python" "-m" "pytest" "-vvv"))))))) + (list + #:test-flags + #~(list "-k" + (string-append + ;; Disable tests requiring network access. + "not test_urlopen_disabled" + " and not test_parametrize_with_socket_enabled_and_allow_hosts" + " and not test_enabled_urllib_succeeds" + " and not test_urllib_succeeds_by_default" + " and not test_disabled_urllib_fails" + " and not test_httpx_fails" + " and not test_asynctest" + " and not test_global_disable_and_allow_host")))) (native-inputs (list python-httpx python-poetry-core python-pypa-build