[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/11: tests: Move OpenPGP helpers to (guix tests gnupg).
From: |
guix-commits |
Subject: |
04/11: tests: Move OpenPGP helpers to (guix tests gnupg). |
Date: |
Tue, 16 Jun 2020 10:16:10 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 1e2b9bf2d4ed4edc9ed70c51f414bb2890074a21
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Jun 8 16:34:53 2020 +0200
tests: Move OpenPGP helpers to (guix tests gnupg).
* tests/git-authenticate.scm (key-id): Remove.
(%ed25519-public-key-file, %ed25519-secret-key-file)
(%ed25519bis-public-key-file, %ed25519bis-secret-key-file)
(read-openpgp-packet, key-fingerprint): Move to...
* guix/tests/gnupg.scm: ... here.
---
guix/tests/gnupg.scm | 32 +++++++++++++++++++++++++++++++-
tests/git-authenticate.scm | 25 -------------------------
2 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/guix/tests/gnupg.scm b/guix/tests/gnupg.scm
index 47c858d..eb8ff63 100644
--- a/guix/tests/gnupg.scm
+++ b/guix/tests/gnupg.scm
@@ -17,12 +17,23 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix tests gnupg)
+ #:use-module (guix openpgp)
#:use-module (guix utils)
#:use-module (guix build utils)
+ #:use-module (rnrs io ports)
#:use-module (ice-9 match)
#:export (gpg-command
gpgconf-command
- with-fresh-gnupg-setup))
+ with-fresh-gnupg-setup
+
+ %ed25519-public-key-file
+ %ed25519-secret-key-file
+ %ed25519bis-public-key-file
+ %ed25519bis-secret-key-file
+
+ read-openpgp-packet
+ key-fingerprint
+ key-id))
(define gpg-command
(make-parameter "gpg"))
@@ -50,3 +61,22 @@ listed in IMPORTED, and only them, have been imported. This
sets 'GNUPGHOME'
such that the user's real GnuPG files are left untouched. The 'gpg-agent'
process is terminated afterwards."
(call-with-fresh-gnupg-setup imported (lambda () exp ...)))
+
+(define %ed25519-public-key-file
+ (search-path %load-path "tests/ed25519.key"))
+(define %ed25519-secret-key-file
+ (search-path %load-path "tests/ed25519.sec"))
+(define %ed25519bis-public-key-file
+ (search-path %load-path "tests/ed25519bis.key"))
+(define %ed25519bis-secret-key-file
+ (search-path %load-path "tests/ed25519bis.sec"))
+
+(define (read-openpgp-packet file)
+ (get-openpgp-packet
+ (open-bytevector-input-port
+ (call-with-input-file file read-radix-64))))
+
+(define key-fingerprint
+ (compose openpgp-format-fingerprint
+ openpgp-public-key-fingerprint
+ read-openpgp-packet))
diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm
index 97990ac..a06176c 100644
--- a/tests/git-authenticate.scm
+++ b/tests/git-authenticate.scm
@@ -32,31 +32,6 @@
;; Test the (guix git-authenticate) tools.
-(define %ed25519-public-key-file
- (search-path %load-path "tests/ed25519.key"))
-(define %ed25519-secret-key-file
- (search-path %load-path "tests/ed25519.sec"))
-(define %ed25519bis-public-key-file
- (search-path %load-path "tests/ed25519bis.key"))
-(define %ed25519bis-secret-key-file
- (search-path %load-path "tests/ed25519bis.sec"))
-
-(define (read-openpgp-packet file)
- (get-openpgp-packet
- (open-bytevector-input-port
- (call-with-input-file file read-radix-64))))
-
-(define key-fingerprint
- (compose openpgp-format-fingerprint
- openpgp-public-key-fingerprint
- read-openpgp-packet))
-
-(define (key-id file)
- (define id
- (openpgp-public-key-id (read-openpgp-packet)))
-
- (string-pad (number->string id 16) 16 #\0))
-
(define (gpg+git-available?)
(and (which (git-command))
(which (gpg-command)) (which (gpgconf-command))))
- branch master updated (3646a44 -> 619972f), guix-commits, 2020/06/16
- 01/11: doc: Recommend "make authenticate" after ./bootstrap., guix-commits, 2020/06/16
- 02/11: git-authenticate: Cache takes a key parameter., guix-commits, 2020/06/16
- 03/11: git-authenticate: 'authenticate-commits' takes a #:keyring parameter., guix-commits, 2020/06/16
- 05/11: channels: 'latest-channel-instance' authenticates Git checkouts., guix-commits, 2020/06/16
- 06/11: channels: Make 'validate-pull' call right after clone/pull., guix-commits, 2020/06/16
- 07/11: .guix-channel: Add 'keyring-reference'., guix-commits, 2020/06/16
- 09/11: pull: Add '--disable-authentication'., guix-commits, 2020/06/16
- 04/11: tests: Move OpenPGP helpers to (guix tests gnupg).,
guix-commits <=
- 08/11: channels: Automatically add introduction for the official 'guix' channel., guix-commits, 2020/06/16
- 11/11: maint: "make authenticate" behaves like 'guix pull' by default., guix-commits, 2020/06/16
- 10/11: time-machine: Add '--disable-authentication'., guix-commits, 2020/06/16