diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-06-25 00:08:05 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-07-01 23:34:51 +0200 |
| commit | 8b7d982e6ae090eb5b3938db14a8eb2e2c3a1419 (patch) | |
| tree | 63cf99e39646f07d849c46a656e233e164e88f11 /tests/channels.scm | |
| parent | 6577682a6c4885020949e014a536f96e8ae315d0 (diff) | |
channels: Make channel introductions public.
* guix/channels.scm (<channel-introduction>): Rename constructor to
'%make-channel-introduction'.
(make-channel-introduction): New procedure.
* tests/channels.scm ("authenticate-channel, wrong first commit signer")
("authenticate-channel, .guix-authorizations"): Use
'make-channel-introduction' without '@@' and without third argument.
* doc/guix.texi (Channels)[Channel Authentication, Specifying Channel
Authorizations]: New subsections.
Diffstat (limited to 'tests/channels.scm')
| -rw-r--r-- | tests/channels.scm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/channels.scm b/tests/channels.scm index d7202f8cbfd..591b7b9749c 100644 --- a/tests/channels.scm +++ b/tests/channels.scm | |||
| @@ -451,12 +451,11 @@ | |||
| 451 | (with-repository directory repository | 451 | (with-repository directory repository |
| 452 | (let* ((commit1 (find-commit repository "first")) | 452 | (let* ((commit1 (find-commit repository "first")) |
| 453 | (commit2 (find-commit repository "second")) | 453 | (commit2 (find-commit repository "second")) |
| 454 | (intro ((@@ (guix channels) make-channel-introduction) | 454 | (intro (make-channel-introduction |
| 455 | (commit-id-string commit1) | 455 | (commit-id-string commit1) |
| 456 | (openpgp-public-key-fingerprint | 456 | (openpgp-public-key-fingerprint |
| 457 | (read-openpgp-packet | 457 | (read-openpgp-packet |
| 458 | %ed25519bis-public-key-file)) ;different key | 458 | %ed25519bis-public-key-file)))) ;different key |
| 459 | #f)) ;no signature | ||
| 460 | (channel (channel (name 'example) | 459 | (channel (channel (name 'example) |
| 461 | (url (string-append "file://" directory)) | 460 | (url (string-append "file://" directory)) |
| 462 | (introduction intro)))) | 461 | (introduction intro)))) |
| @@ -507,12 +506,11 @@ | |||
| 507 | (let* ((commit1 (find-commit repository "first")) | 506 | (let* ((commit1 (find-commit repository "first")) |
| 508 | (commit2 (find-commit repository "second")) | 507 | (commit2 (find-commit repository "second")) |
| 509 | (commit3 (find-commit repository "third")) | 508 | (commit3 (find-commit repository "third")) |
| 510 | (intro ((@@ (guix channels) make-channel-introduction) | 509 | (intro (make-channel-introduction |
| 511 | (commit-id-string commit1) | 510 | (commit-id-string commit1) |
| 512 | (openpgp-public-key-fingerprint | 511 | (openpgp-public-key-fingerprint |
| 513 | (read-openpgp-packet | 512 | (read-openpgp-packet |
| 514 | %ed25519-public-key-file)) | 513 | %ed25519-public-key-file)))) |
| 515 | #f)) ;no signature | ||
| 516 | (channel (channel (name 'example) | 514 | (channel (channel (name 'example) |
| 517 | (url (string-append "file://" directory)) | 515 | (url (string-append "file://" directory)) |
| 518 | (introduction intro)))) | 516 | (introduction intro)))) |