guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

03/03: tests: Adjust pypi test to recent changes.


From: guix-commits
Subject: 03/03: tests: Adjust pypi test to recent changes.
Date: Fri, 11 Feb 2022 17:53:02 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 0f1cb023628d738bb21425c1921d17672db4f890
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Feb 11 23:47:05 2022 +0100

    tests: Adjust pypi test to recent changes.
    
    This is a followup to 00762a4c4c8ecdd71cccf6afdd87ae68bf9b4964.
    
    * tests/pypi.scm ("pypi->guix-package, no wheel"): Guard against
    'error?' instead of 'quit'.
---
 tests/pypi.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/pypi.scm b/tests/pypi.scm
index 47a276ae58..88bb0a3116 100644
--- a/tests/pypi.scm
+++ b/tests/pypi.scm
@@ -32,6 +32,8 @@
   #:use-module ((guix diagnostics) #:select (guix-warning-port))
   #:use-module (json)
   #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 match)
   #:use-module (ice-9 optargs))
@@ -265,10 +267,8 @@ Requires-Dist: pytest (>=3.1.0); extra == 'testing'
                                   hash)
                         (equal? (pypi->guix-package "foo" #:version "1.0.0")
                                 (pypi->guix-package "foo"))
-                        (catch 'quit
-                          (lambda ()
-                            (pypi->guix-package "foo" #:version "42"))
-                          (const #t))))
+                        (guard (c ((error? c) #t))
+                          (pypi->guix-package "foo" #:version "42"))))
                   (x
                    (pk 'fail x #f))))))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]