Patchwork [3,of,3] test-gpg: run migration of v1 secret keys beforehand

login
register
mail settings
Submitter Yuya Nishihara
Date Aug. 14, 2016, 9:29 a.m.
Message ID <0cb2d4db308b97e8fe7f.1471166967@mimosa>
Download mbox | patch
Permalink /patch/16275/
State Accepted
Headers show

Comments

Yuya Nishihara - Aug. 14, 2016, 9:29 a.m.
# 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".
Augie Fackler - Aug. 16, 2016, 2:03 p.m.
On Sun, Aug 14, 2016 at 06:29:27PM +0900, Yuya Nishihara wrote:
> # 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

Queued these, thanks.

>
> 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
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

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