[Pkg-gnupg-commit] [gnupg2] 04/21: tests: Fix a test which specifies expiration date.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Tue Sep 19 15:33:54 UTC 2017


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit a172759b5088ae086c0caa2e7d4d0ea346b28a90
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Sep 8 14:21:29 2017 +0900

    tests: Fix a test which specifies expiration date.
    
    * tests/openpgp/quick-key-manipulation.scm: Fix expiration time
    comparison.
    
    --
    
    This is a bug fix for Amelia Earhart who is probably in UTC-12.
    
    When expiration date is specified, GnuPG interprets it as noon of the
    date in local time.
    
    Before this fix, the test compared the value by 2145916800 which is
    2038-01-01 00:00:00 in UTC with allowance of 1 day.  When the test
    was ran in UTC-12 timezone, it failed because of noon in the timezone
    is midnight of the next day in UTC.
    
    GnuPG-bug-id: 3393
    Reported-by: Daniel Kahn Gillmor
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 tests/openpgp/quick-key-manipulation.scm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/openpgp/quick-key-manipulation.scm b/tests/openpgp/quick-key-manipulation.scm
index c21abfe..2023f17 100755
--- a/tests/openpgp/quick-key-manipulation.scm
+++ b/tests/openpgp/quick-key-manipulation.scm
@@ -178,11 +178,11 @@
   (lambda (subkey)
     (assert (= 1 (:alg subkey)))
     (assert (string-contains? (:cap subkey) "s"))
-    (assert (time-matches? 2145916800    ;; 2038-01-01
-			   ;; 4260207600 ;; 2105-01-01
+    (assert (time-matches? 2145960000    ;; UTC 2038-01-01 12:00:00
+			   ;; 4260254400 ;; UTC 2105-01-01 12:00:00
 			   (string->number (:expire subkey))
-			   ;; This is off by 12h, but I guess it just
-			   ;; choses the middle of the day.
+			   ;; GnuPG choses the middle of the day (local time)
+			   ;; when no hh:mm:ss is specified
 			   (days->seconds 1))))
   (lambda (subkey)
     (assert (= 1 (:alg subkey)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list