[PATCH v2 03/10] tests: prepare for more crypto tests (using add_gnupg_home)

[Jani Nikula]

On Fri, 15 Sep 2017, Daniel Kahn Gillmor <dkg at fifthhorseman.net> wrote:
> Move add_gnupg_home to test-lib.sh to prepare it for reuse.
> ---
>  test/T350-crypto.sh | 17 -----------------
>  test/test-lib.sh    | 15 +++++++++++++++
>  2 files changed, 15 insertions(+), 17 deletions(-)
>
> diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh
> index 1d408af7..e1b8fd83 100755
> --- a/test/T350-crypto.sh
> +++ b/test/T350-crypto.sh
> @@ -7,23 +7,6 @@
>  test_description='PGP/MIME signature verification and decryption'
>  . ./test-lib.sh || exit 1
>  
> -add_gnupg_home ()
> -{
> -    local output
> -    [ -d ${GNUPGHOME} ] && return
> -    _gnupg_exit () { gpgconf --kill all 2>/dev/null || true; }
> -    at_exit_function _gnupg_exit

The above lines get dropped. Rebase fail?

BR,
Jani.

> -    mkdir -m 0700 "$GNUPGHOME"
> -    gpg --no-tty --import <$TEST_DIRECTORY/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1
> -    test_debug "cat $GNUPGHOME/import.log"
> -    if (gpg --quick-random --version >/dev/null 2>&1) ; then
> -	echo quick-random >> "$GNUPGHOME"/gpg.conf
> -    elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
> -	echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
> -    fi
> -    echo no-emit-version >> "$GNUPGHOME"/gpg.conf
> -}
> -
>  ##################################################
>  
>  add_gnupg_home
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 35024649..b8427d97 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -93,6 +93,21 @@ unset GREP_OPTIONS
>  # For emacsclient
>  unset ALTERNATE_EDITOR
>  
> +add_gnupg_home ()
> +{
> +    local output
> +    [ -d ${GNUPGHOME} ] && return
> +    mkdir -m 0700 "$GNUPGHOME"
> +    gpg --no-tty --import <$TEST_DIRECTORY/gnupg-secret-key.asc >"$GNUPGHOME"/import.log 2>&1
> +    test_debug "cat $GNUPGHOME/import.log"
> +    if (gpg --quick-random --version >/dev/null 2>&1) ; then
> +	echo quick-random >> "$GNUPGHOME"/gpg.conf
> +    elif (gpg --debug-quick-random --version >/dev/null 2>&1) ; then
> +	echo debug-quick-random >> "$GNUPGHOME"/gpg.conf
> +    fi
> +    echo no-emit-version >> "$GNUPGHOME"/gpg.conf
> +}
> +
>  # Each test should start with something like this, after copyright notices:
>  #
>  # test_description='Description of this test...
> -- 
> 2.14.1
>
> _______________________________________________
> notmuch mailing list
> notmuch at notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch