me
/
guix
Archived
1
0
Fork 0
Code

status: Change tests from SRFI-11 to SRFI-71. 

* tests/status.scm: Use SRFI-71 'let' instead of SRFI-11 'let-values'.
master
Ludovic Courtès 2022-06-26 16:00:17 +02:00
parent d9d77d9479
commit c31605b582
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 34 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/status.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018, 2019, 2022 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -19,8 +19,8 @@
(define-module (test-status)
#:use-module (guix status)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-11)
#:use-module (srfi srfi-64)
#:use-module (srfi srfi-71)
#:use-module (rnrs bytevectors)
#:use-module (rnrs io ports)
#:use-module (ice-9 match))
@ -29,8 +29,7 @@
(test-equal "compute-status, no-op"
(build-status)
(let-values (((port get-status)
(build-event-output-port compute-status)))
(let ((port get-status (build-event-output-port compute-status)))
(display "foo\nbar\n\baz\n" port)
(get-status)))
@ -53,7 +52,7 @@
#:transferred 500
#:start 'now
#:end 'now)))))
(let-values (((port get-status)
(let ((port get-status
(build-event-output-port (lambda (event status)
(compute-status event status
#:current-time
@ -100,7 +99,7 @@
#:start 'now
#:end 'now)))))
;; Below we omit 'substituter-started' events and the like.
(let-values (((port get-status)
(let ((port get-status
(build-event-output-port (lambda (event status)
(compute-status event status
#:current-time
@ -119,8 +118,8 @@
(test-equal "build-output-port, UTF-8"
'((build-log #f "lambda is λ!\n"))
(let-values (((port get-status) (build-event-output-port cons '()))
((bv) (string->utf8 "lambda is λ!\n")))
(let ((port get-status (build-event-output-port cons '()))
(bv (string->utf8 "lambda is λ!\n")))
(put-bytevector port bv)
(force-output port)
(get-status)))
@ -129,7 +128,7 @@
;; What about a mixture of UTF-8 + garbage?
(let ((replacement "<22>"))
`((build-log #f ,(string-append "garbage: " replacement "lambda: λ\n"))))
(let-values (((port get-status) (build-event-output-port cons '())))
(let ((port get-status (build-event-output-port cons '())))
(display "garbage: " port)
(put-bytevector port #vu8(128))
(put-bytevector port (string->utf8 "lambda: λ\n"))
@ -156,7 +155,7 @@
#:transferred 999
#:start 'now
#:end 'now)))))
(let-values (((port get-status)
(let ((port get-status
(build-event-output-port (lambda (event status)
(compute-status event status
#:current-time
@ -192,7 +191,7 @@
(build-status
(builds-completed (list (build "foo.drv" "x86_64-linux" #:id 121
#:completion 100.)))))
(let-values (((port get-status)
(let ((port get-status
(build-event-output-port (lambda (event status)
(compute-status event status
#:current-time
@ -225,7 +224,7 @@
(build-status
(builds-completed (list (build "foo.drv" "x86_64-linux" #:id 121
#:phase 'install)))))
(let-values (((port get-status)
(let ((port get-status
(build-event-output-port (lambda (event status)
(compute-status event status
#:current-time