From patchwork Fri Jun 11 04:12:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Sundberg X-Patchwork-Id: 30113 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 E423727BC78; Fri, 11 Jun 2021 05:13:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 386E327BC81 for ; Fri, 11 Jun 2021 05:13:13 +0100 (BST) Received: from localhost ([::1]:34648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrYXg-0003Pf-Ae for patchwork@mira.cbaines.net; Fri, 11 Jun 2021 00:13:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrYXW-0003P0-OU for guix-patches@gnu.org; Fri, 11 Jun 2021 00:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54643) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lrYXW-0005f0-Eg for guix-patches@gnu.org; Fri, 11 Jun 2021 00:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lrYXW-0004tm-Az for guix-patches@gnu.org; Fri, 11 Jun 2021 00:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#48954] [PATCH] gnu: python-lint-cfn: Fix non-reproducible test suite Resent-From: Ryan Sundberg Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 11 Jun 2021 04:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 48954 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48954@debbugs.gnu.org Cc: Ryan Sundberg X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.162338477918820 (code B ref -1); Fri, 11 Jun 2021 04:13:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Jun 2021 04:12:59 +0000 Received: from localhost ([127.0.0.1]:37954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrYXT-0004tU-Gp for submit@debbugs.gnu.org; Fri, 11 Jun 2021 00:12:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:50376) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lrYXN-0004tH-VE for submit@debbugs.gnu.org; Fri, 11 Jun 2021 00:12:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54878) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrYXN-0003Oq-PI for guix-patches@gnu.org; Fri, 11 Jun 2021 00:12:53 -0400 Received: from mail.arctype.co ([138.68.9.245]:40130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrYXH-0005Qk-6g for guix-patches@gnu.org; Fri, 11 Jun 2021 00:12:53 -0400 Received: from authenticated-user (mail.arctype.co [138.68.9.245]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.arctype.co (Postfix) with ESMTPSA id 8D62711EF11; Thu, 10 Jun 2021 21:12:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arctype.co; s=mail; t=1623384763; bh=PZ/vqY50QeSuBQDfwiKqB7/oLNoojJblZsxJpZB3eU0=; h=From:To:Cc:Subject:Date:From; b=p4JPekmgp24EQG8tnioRNolxQzRqM0VvYYTWYyYxnjGr9fbQm1ZLP8FxGgLqKiRw0 bYthk48L8EpLzDZ+LVZSiFfoabhC1WgWrkoUYzgy8UUHKSwp1qJKrhjl4T6VmJgIR9 WzExHCaypTEWD1GJkRL4mCHmlbq2UXqTn8i4V7AV8cnZ+LA+YMYTECb3ZoCswivCBP p5nf9ilMg2StzpJsbcbXs4DmPj19+U6gT3c46JFlr1nz8M9UHgTBSon1ieKDVqWGYm xmtaV4OftCSKNkYWo/9siSqXHh0WS5yntuavffF0MBj8zTd/qSZ3FPIXsYKclCc3Ud z7qQZ30712bCQ== Date: Thu, 10 Jun 2021 21:12:33 -0700 Message-Id: <20210611041233.19012-1-ryan@arctype.co> MIME-Version: 1.0 Received-SPF: pass client-ip=138.68.9.245; envelope-from=ryan@arctype.co; helo=mail.arctype.co X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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" Reply-to: Ryan Sundberg X-ACL-Warn: , Ryan Sundberg via Guix-patches X-Patchwork-Original-From: Ryan Sundberg via Guix-patches via From: Ryan Sundberg X-getmail-retrieved-from-mailbox: Patches Some tests for python-cfn-lint are dependent on the date the tests are run, which can cause the tests to spontaneously start failing. See https://github.com/aws-cloudformation/cfn-lint/issues/1705 for the upstream discssion. This patch removes the unstable test cases. * gnu/packages/python-web.scm: Patch python-cfn-lint tests Signed-off-by: Ryan Sundberg --- ...n-lint-disable-nonreproducible-tests.patch | 42 +++++++++++++++++++ gnu/packages/python-web.scm | 6 ++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/python-cfn-lint-disable-nonreproducible-tests.patch diff --git a/gnu/packages/patches/python-cfn-lint-disable-nonreproducible-tests.patch b/gnu/packages/patches/python-cfn-lint-disable-nonreproducible-tests.patch new file mode 100644 index 0000000000..e9fb1bda45 --- /dev/null +++ b/gnu/packages/patches/python-cfn-lint-disable-nonreproducible-tests.patch @@ -0,0 +1,42 @@ +diff --git a/test/integration/test_quickstart_templates.py b/test/integration/test_quickstart_templates.py +index 41058b29..d859b6d1 100644 +--- a/test/integration/test_quickstart_templates.py ++++ b/test/integration/test_quickstart_templates.py +@@ -59,16 +59,6 @@ class TestQuickStartTemplates(BaseCliTestCase): + 'filename': 'test/fixtures/templates/quickstart/openshift_master.yaml', + 'results_filename': 'test/fixtures/results/quickstart/openshift_master.json', + 'exit_code': 8, +- }, +- { +- 'filename': 'test/fixtures/templates/quickstart/openshift.yaml', +- 'results_filename': 'test/fixtures/results/quickstart/openshift.json', +- 'exit_code': 14, +- }, +- { +- 'filename': 'test/fixtures/templates/quickstart/cis_benchmark.yaml', +- 'results_filename': 'test/fixtures/results/quickstart/cis_benchmark.json', +- 'exit_code': 6, + } + ] + +diff --git a/test/integration/test_quickstart_templates_non_strict.py b/test/integration/test_quickstart_templates_non_strict.py +index 7372fb0b..85637c91 100644 +--- a/test/integration/test_quickstart_templates_non_strict.py ++++ b/test/integration/test_quickstart_templates_non_strict.py +@@ -19,16 +19,6 @@ class TestQuickStartTemplates(BaseCliTestCase): + 'filename': 'test/fixtures/templates/quickstart/nist_application.yaml', + 'results_filename': 'test/fixtures/results/quickstart/non_strict/nist_application.json', + 'exit_code': 12, +- }, +- { +- 'filename': 'test/fixtures/templates/quickstart/openshift.yaml', +- 'results_filename': 'test/fixtures/results/quickstart/non_strict/openshift.json', +- 'exit_code': 12, +- }, +- { +- 'filename': 'test/fixtures/templates/quickstart/cis_benchmark.yaml', +- 'results_filename': 'test/fixtures/results/quickstart/non_strict/cis_benchmark.json', +- 'exit_code': 4, + } + ] + diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm index 1d65b2b0a8..9c05052a7d 100644 --- a/gnu/packages/python-web.scm +++ b/gnu/packages/python-web.scm @@ -475,7 +475,11 @@ emit information from within their applications to the AWS X-Ray service.") (file-name (git-file-name name version)) (sha256 (base32 - "0nqs0fmj3hd7pnd9hkb4z57jvi2iv82hh6n3xxba6i6p8zgx75q4")))) + "0nqs0fmj3hd7pnd9hkb4z57jvi2iv82hh6n3xxba6i6p8zgx75q4")) + ;; Some test cases for this program are dependent on the date the + ;; tests are run. Disable those tests. + ;; See https://github.com/aws-cloudformation/cfn-lint/issues/1705 + (patches (search-patches "python-cfn-lint-disable-nonreproducible-tests.patch")))) (build-system python-build-system) (arguments `(#:phases (modify-phases %standard-phases