[Pkg-gnupg-commit] [gnupg2] 110/132: tests: Clarify comments.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 38b48eb11b77b45c9d0292270f83e26e308f68e4
Author: Justus Winter <justus at g10code.com>
Date:   Mon May 8 12:37:20 2017 +0200

    tests: Clarify comments.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/openpgp/delete-keys.scm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/tests/openpgp/delete-keys.scm b/tests/openpgp/delete-keys.scm
index 76cd424..16bde5f 100755
--- a/tests/openpgp/delete-keys.scm
+++ b/tests/openpgp/delete-keys.scm
@@ -58,13 +58,16 @@
   (call-check `(, at gpg --delete-secret-keys ,subkey::fpr))
   (assert (have-public-key? key))
   (assert (have-public-key? subkey))
-  ;; JW: Deleting the secret subkey also deletes the secret key.
+  ;; JW: Deleting the secret subkey also deletes the secret key.  This
+  ;; is a deliberate design choice, and currently there is no way to
+  ;; delete the subkey without using --edit-key.
   ;; XXX (assert (have-secret-key? key))
   ;; XXX (assert (have-secret-key-file? key))
   (assert (not (have-secret-key? subkey)))
   (assert (not (have-secret-key-file? subkey)))
 
   ;; Then, delete the secret key.
+  ;; JW: We already deleted the key.  See above.
   ;; XXX (call-check `(, at gpg --delete-secret-keys ,key::fpr))
   (assert (have-public-key? key))
   (assert (have-public-key? subkey))
@@ -75,11 +78,14 @@
 
   ;; Now, delete the public subkey.
   (call-check `(, at gpg --delete-keys ,subkey::fpr))
-  ;; JW: Deleting the subkey also deletes the key.
+  ;; JW: Deleting the subkey also deletes the key.  This
+  ;; is a deliberate design choice, and currently there is no way to
+  ;; delete the subkey without using --edit-key.
   ;; XXX (assert (have-public-key? key))
   (assert (not (have-public-key? subkey)))
 
   ;; Now, delete the public key.
+  ;; JW: We already deleted the key.  See above.
   ;; XXX (call-check `(, at gpg --delete-keys ,key::fpr))
   (assert (not (have-public-key? key)))
   (assert (not (have-public-key? subkey))))

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