[Pkg-gnupg-commit] [gnupg2] 16/159: tests: Add some more gpgtar tests.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 1c8eae95a8b3b89bc0f49cb5f4938101634583dc
Author: Justus Winter <justus at g10code.com>
Date:   Mon Dec 7 12:53:57 2015 +0100

    tests: Add some more gpgtar tests.
    
    * tests/openpgp/gpgtar.test: Add more tests.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 tests/openpgp/gpgtar.test | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/tests/openpgp/gpgtar.test b/tests/openpgp/gpgtar.test
index 124ba40..e6290b0 100755
--- a/tests/openpgp/gpgtar.test
+++ b/tests/openpgp/gpgtar.test
@@ -25,6 +25,8 @@ TESTFILES="$plain_files $data_files"
 TESTDIR=gpgtar.d
 FILELIST="${TESTDIR}/filelist"
 PPFILE="${TESTDIR}/passphrase"
+PPFLAGS="--gpg-args --passphrase-file=$PPFILE"
+
 GPG=../../g10/gpg2
 GPGARGS="$opt_always --no-permission-warning"
 
@@ -73,25 +75,44 @@ do_test()
 for TOOL in "$GPGTAR" "$GPGZIP"
 #for TOOL in "$GPGZIP"
 do
+    # Asymmetric encryption.
     do_test "$TOOL" \
 	    "--encrypt --recipient $usrname2" \
 	    "--list-archive" \
 	    "--decrypt"
 
+    # Asymmetric encryption and signing.
     do_test "$TOOL" \
 	    "--encrypt --recipient $usrname2 --sign --local-user $usrname3" \
 	    "--list-archive" \
 	    "--decrypt"
 
+    # Signing only.
     do_test "$TOOL" \
 	    "--sign --local-user $usrname3" \
 	    "--list-archive" \
 	    "--decrypt"
 
+    # Symmetric encryption.
+    do_test "$TOOL" \
+	    "${PPFLAGS} --symmetric" \
+	    "${PPFLAGS} --list-archive" \
+	    "${PPFLAGS} --decrypt"
+
+    # Symmetric encryption, explicitly choose cipher.
+    for a in `all_cipher_algos`; do
+	do_test "$TOOL" \
+		"${PPFLAGS} --gpg-args --cipher=$a --symmetric" \
+		"${PPFLAGS} --list-archive" \
+		"${PPFLAGS} --decrypt"
+	break
+    done
+
+    # Asymmetric and symmetric encryption, and signing.
     do_test "$TOOL" \
-	    "--gpg-args --passphrase-file=$PPFILE --symmetric" \
-	    "--gpg-args --passphrase-file=$PPFILE --list-archive" \
-	    "--gpg-args --passphrase-file=$PPFILE --decrypt"
+	    "${PPFLAGS} --encrypt --symmetric --recipient $usrname2 --sign --local-user $usrname3" \
+	    "${PPFLAGS} --list-archive" \
+	    "${PPFLAGS} --decrypt"
 done
 
 # Success!

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