From 0f1cb023628d738bb21425c1921d17672db4f890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Fri, 11 Feb 2022 23:47:05 +0100 Subject: [PATCH] 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 @@ (define-module (test-pypi) #: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 @@ (define test-metadata-with-extras-jedi "\ 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))))))