summaryrefslogtreecommitdiff
path: root/tests/git-authenticate.scm
diff options
context:
space:
mode:
Diffstat (limited to 'tests/git-authenticate.scm')
-rw-r--r--tests/git-authenticate.scm23
1 files changed, 11 insertions, 12 deletions
diff --git a/tests/git-authenticate.scm b/tests/git-authenticate.scm
index d87eacc6596..f66ef191b09 100644
--- a/tests/git-authenticate.scm
+++ b/tests/git-authenticate.scm
@@ -161,14 +161,14 @@
161(test-assert "signed commits, .guix-authorizations, unauthorized merge" 161(test-assert "signed commits, .guix-authorizations, unauthorized merge"
162 (with-fresh-gnupg-setup (list %ed25519-public-key-file 162 (with-fresh-gnupg-setup (list %ed25519-public-key-file
163 %ed25519-secret-key-file 163 %ed25519-secret-key-file
164 %ed25519bis-public-key-file 164 %ed25519-2-public-key-file
165 %ed25519bis-secret-key-file) 165 %ed25519-2-secret-key-file)
166 (with-temporary-git-repository directory 166 (with-temporary-git-repository directory
167 `((add "signer1.key" 167 `((add "signer1.key"
168 ,(call-with-input-file %ed25519-public-key-file 168 ,(call-with-input-file %ed25519-public-key-file
169 get-string-all)) 169 get-string-all))
170 (add "signer2.key" 170 (add "signer2.key"
171 ,(call-with-input-file %ed25519bis-public-key-file 171 ,(call-with-input-file %ed25519-2-public-key-file
172 get-string-all)) 172 get-string-all))
173 (add ".guix-authorizations" 173 (add ".guix-authorizations"
174 ,(object->string 174 ,(object->string
@@ -184,7 +184,7 @@
184 (checkout "devel") 184 (checkout "devel")
185 (add "devel/1.txt" "1") 185 (add "devel/1.txt" "1")
186 (commit "first devel commit" 186 (commit "first devel commit"
187 (signer ,(key-fingerprint %ed25519bis-public-key-file))) 187 (signer ,(key-fingerprint %ed25519-2-public-key-file)))
188 (checkout "master") 188 (checkout "master")
189 (add "b.txt" "B") 189 (add "b.txt" "B")
190 (commit "second commit" 190 (commit "second commit"
@@ -203,7 +203,7 @@
203 (openpgp-public-key-fingerprint 203 (openpgp-public-key-fingerprint
204 (unauthorized-commit-error-signing-key c)) 204 (unauthorized-commit-error-signing-key c))
205 (openpgp-public-key-fingerprint 205 (openpgp-public-key-fingerprint
206 (read-openpgp-packet %ed25519bis-public-key-file))))) 206 (read-openpgp-packet %ed25519-2-public-key-file)))))
207 207
208 (and (authenticate-commits repository (list master1 master2) 208 (and (authenticate-commits repository (list master1 master2)
209 #:keyring-reference "master") 209 #:keyring-reference "master")
@@ -230,14 +230,14 @@
230(test-assert "signed commits, .guix-authorizations, authorized merge" 230(test-assert "signed commits, .guix-authorizations, authorized merge"
231 (with-fresh-gnupg-setup (list %ed25519-public-key-file 231 (with-fresh-gnupg-setup (list %ed25519-public-key-file
232 %ed25519-secret-key-file 232 %ed25519-secret-key-file
233 %ed25519bis-public-key-file 233 %ed25519-2-public-key-file
234 %ed25519bis-secret-key-file) 234 %ed25519-2-secret-key-file)
235 (with-temporary-git-repository directory 235 (with-temporary-git-repository directory
236 `((add "signer1.key" 236 `((add "signer1.key"
237 ,(call-with-input-file %ed25519-public-key-file 237 ,(call-with-input-file %ed25519-public-key-file
238 get-string-all)) 238 get-string-all))
239 (add "signer2.key" 239 (add "signer2.key"
240 ,(call-with-input-file %ed25519bis-public-key-file 240 ,(call-with-input-file %ed25519-2-public-key-file
241 get-string-all)) 241 get-string-all))
242 (add ".guix-authorizations" 242 (add ".guix-authorizations"
243 ,(object->string 243 ,(object->string
@@ -258,12 +258,12 @@
258 %ed25519-public-key-file) 258 %ed25519-public-key-file)
259 (name "Alice")) 259 (name "Alice"))
260 (,(key-fingerprint 260 (,(key-fingerprint
261 %ed25519bis-public-key-file)))))) 261 %ed25519-2-public-key-file))))))
262 (commit "first devel commit" 262 (commit "first devel commit"
263 (signer ,(key-fingerprint %ed25519-public-key-file))) 263 (signer ,(key-fingerprint %ed25519-public-key-file)))
264 (add "devel/2.txt" "2") 264 (add "devel/2.txt" "2")
265 (commit "second devel commit" 265 (commit "second devel commit"
266 (signer ,(key-fingerprint %ed25519bis-public-key-file))) 266 (signer ,(key-fingerprint %ed25519-2-public-key-file)))
267 (checkout "master") 267 (checkout "master")
268 (add "b.txt" "B") 268 (add "b.txt" "B")
269 (commit "second commit" 269 (commit "second commit"
@@ -273,7 +273,7 @@
273 ;; After the merge, the second signer is authorized. 273 ;; After the merge, the second signer is authorized.
274 (add "c.txt" "C") 274 (add "c.txt" "C")
275 (commit "third commit" 275 (commit "third commit"
276 (signer ,(key-fingerprint %ed25519bis-public-key-file)))) 276 (signer ,(key-fingerprint %ed25519-2-public-key-file))))
277 (with-repository directory repository 277 (with-repository directory repository
278 (let ((master1 (find-commit repository "first commit")) 278 (let ((master1 (find-commit repository "first commit"))
279 (master2 (find-commit repository "second commit")) 279 (master2 (find-commit repository "second commit"))
@@ -328,4 +328,3 @@
328 'failed))))))) 328 'failed)))))))
329 329
330(test-end "git-authenticate") 330(test-end "git-authenticate")
331