From patchwork Sun Aug 14 09:29:27 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [3,of,3] test-gpg: run migration of v1 secret keys beforehand
From: Yuya Nishihara <yuya@tcha.org>
X-Patchwork-Id: 16275
Message-Id: <0cb2d4db308b97e8fe7f.1471166967@mimosa>
To: mercurial-devel@mercurial-scm.org
Date: Sun, 14 Aug 2016 18:29:27 +0900

# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1471162025 -32400
#      Sun Aug 14 17:07:05 2016 +0900
# Node ID 0cb2d4db308b97e8fe7faa8d45a47b228037f230
# Parent  20ffcea3fc24f0ef534cd117bbbee134a8dc929c
test-gpg: run migration of v1 secret keys beforehand

This suppresses unwanted output at "hg sign".

diff --git a/tests/test-gpg.t b/tests/test-gpg.t
--- a/tests/test-gpg.t
+++ b/tests/test-gpg.t
@@ -12,11 +12,13 @@ Test the GPG extension
   $ GNUPGHOME="$TESTTMP/gpg"; export GNUPGHOME
   $ cp -R "$TESTDIR/gpg" "$GNUPGHOME"
 
-Start gpg-agent, which is required by GnuPG v2
+Start gpg-agent, which is required by GnuPG v2, and migrate secret keys
 
 #if gpg2
   $ gpg-connect-agent -q --subst /serverpid '/echo ${get serverpid}' /bye \
   > >> $DAEMON_PIDS
+  $ gpg --no-permission-warning --no-secmem-warning --list-secret-keys \
+  > > /dev/null 2>&1
 #endif
 
   $ hg init r