From 30d2397f73d6fa9e77eed70ec6df8afd3b9f5f5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 10 May 2017 15:25:07 +0200 Subject: [PATCH] ui: 'string->duration' correctly handles hours. * guix/ui.scm (string->duration): Add missing '=>' for hours. * tests/ui.scm ("duration, 2 hours"): New test. --- guix/ui.scm | 1 + tests/ui.scm | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/guix/ui.scm b/guix/ui.scm index e551d48c33..e7cb40927b 100644 --- a/guix/ui.scm +++ b/guix/ui.scm @@ -1008,6 +1008,7 @@ following patterns: \"1d\", \"1w\", \"1m\"." (make-time time-duration 0 (string->number (match:substring match 1))))) ((string-match "^([0-9]+)h$" str) + => (lambda (match) (hours->duration 1 match))) ((string-match "^([0-9]+)d$" str) diff --git a/tests/ui.scm b/tests/ui.scm index cfe417d497..1e98e3534b 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. ;;; @@ -189,6 +189,10 @@ Second line" 24)) (string->duration "1m") (string->duration "30d")) +(test-equal "duration, 2 hours" + 7200 + (time-second (string->duration "2h"))) + (test-equal "duration, 1 second" (make-time time-duration 0 1) (string->duration "1s")) -- 2.20.1