[Pkg-gnupg-commit] [gnupg2] 01/01: update debian/tests/gpgv-win32

[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 a9b925b716ea3158685ce6fcd5ace826373cddda
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Thu Sep 15 15:31:08 2016 -0400

    update debian/tests/gpgv-win32
    
     * make executable
     * use no-allow-loopback-pinentry instead of allow-loopback-pinentry
       with gpgconf --change-options gpg-agent
     * use apt instead of apt-get
     * destroy temporary homedir after test
---
 debian/tests/gpgv-win32 | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/tests/gpgv-win32 b/debian/tests/gpgv-win32
old mode 100644
new mode 100755
index 94dd054..3142a65
--- a/debian/tests/gpgv-win32
+++ b/debian/tests/gpgv-win32
@@ -11,30 +11,30 @@ case "$arch" in
         if ! dpkg --print-foreign-architectures | grep -Fqx i386; then
             echo "I: setting up multiarch"
             dpkg --add-architecture i386
-            apt-get update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
+            apt update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
         fi
     ;;
     arm64)
         if ! dpkg --print-foreign-architectures | grep -Fqx armhf; then
             echo "I: setting up multiarch"
             dpkg --add-architecture armhf
-            apt-get update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
+            apt update # FIXME you might want to try this up to some N times to avoid failures on temporary network issues
         fi
     ;;
     i386|armel|armhf|powerpc)
         : nothing, tests should just work
         ;;
     *)
-        echo "I: skipping tests, only works on amd64 or i386"
+        echo "I: skipping tests on $arch; only works on amd64, i386, arm64, armhf, armel, and powerpc"
         exit
         ;;
 esac
 
 if ! dpkg-query --status wine32 | grep -Fqx 'Status: install ok installed'; then
-    DEBIAN_FRONTEND=noninteractive apt-get install -qy wine32 # FIXME ditto
+    DEBIAN_FRONTEND=noninteractive apt install -qy wine32 # FIXME ditto
 fi
 
-echo 'allow-loopback-pinentry:0:1' | gpgconf --change-options gpg-agent
+echo 'no-allow-loopback-pinentry:16' | gpgconf --change-options gpg-agent
 
 # Generate a minimal signing key:
 gpg2 --batch --debug-quick-random --pinentry-mode loopback --passphrase '' --quick-gen-key   'Test key for gpgv-win32 <test-key at example.com>'
@@ -50,3 +50,5 @@ gpgv2 --keyring "$GNUPGHOME/key.gpg" "${0}.gpg" "${0}"
 
 # Verify using gpgv.exe
 wine /usr/share/win32/gpgv.exe --keyring "Z:\\\\${GNUPGHOME}/key.gpg" "Z:\\\\$(pwd)/${0}.gpg" "Z:\\\\$(pwd)/${0}"
+
+rm -rf "$GNUPGHOME"

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