unofficial mirror of notmuch@notmuchmail.org
 help / color / mirror / code / Atom feed
From: Jani Nikula <jani@nikula.org>
To: Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
	Notmuch Mail <notmuch@notmuchmail.org>
Subject: Re: [PATCH v2 03/10] tests: prepare for more crypto tests (using add_gnupg_home)
Date: Sat, 23 Sep 2017 18:38:10 +0300	[thread overview]
Message-ID: <87wp4pfmsd.fsf@nikula.org> (raw)
In-Reply-To: <20170915055359.24123-4-dkg@fifthhorseman.net>

On Fri, 15 Sep 2017, Daniel Kahn Gillmor <dkg@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@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch

  reply	other threads:[~2017-09-23 15:38 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-12 23:01 [PATCH 01/10] reorganize indexing of multipart/signed and multipart/encrypted Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 02/10] crypto: Move crypto.c into libutil Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 03/10] crypto: make shared crypto code behave library-like Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 04/10] tests: prepare for more crypto tests (using add_gnupg_home) Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 05/10] index: implement notmuch_indexopts_t with try_decrypt Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 06/10] crypto: index encrypted parts when indexopts try_decrypt is set Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 07/10] Define new config option index.try_decrypt Daniel Kahn Gillmor
2017-09-12 23:29   ` Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 08/10] add --try-decrypt=(true|false) to notmuch new Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 09/10] add --try-decrypt=(true|false) to notmuch insert Daniel Kahn Gillmor
2017-09-12 23:01 ` [PATCH 10/10] add --try-decrypt=(true|false) to notmuch reindex Daniel Kahn Gillmor
2017-09-15  5:53   ` cleartext-indexing Daniel Kahn Gillmor
2017-09-15  5:53     ` [PATCH v2 01/10] crypto: Move crypto.c into libutil Daniel Kahn Gillmor
2017-09-23 15:23       ` Jani Nikula
2017-09-15  5:53     ` [PATCH v2 02/10] crypto: make shared crypto code behave library-like Daniel Kahn Gillmor
2017-09-23 15:36       ` Jani Nikula
2017-10-10  3:33         ` Daniel Kahn Gillmor
2017-09-15  5:53     ` [PATCH v2 03/10] tests: prepare for more crypto tests (using add_gnupg_home) Daniel Kahn Gillmor
2017-09-23 15:38       ` Jani Nikula [this message]
2017-09-15  5:53     ` [PATCH v2 04/10] index: implement notmuch_indexopts_t with try_decrypt Daniel Kahn Gillmor
2017-09-23 16:10       ` Jani Nikula
2017-10-10  3:45         ` Daniel Kahn Gillmor
2017-10-14 12:40           ` Jani Nikula
2017-09-15  5:53     ` [PATCH v2 05/10] crypto: index encrypted parts when indexopts try_decrypt is set Daniel Kahn Gillmor
2017-09-23 16:05       ` Jani Nikula
2017-10-10  4:27         ` Daniel Kahn Gillmor
2017-09-15  5:53     ` [PATCH v2 06/10] config: indexing defaults will be stored in the database Daniel Kahn Gillmor
2017-09-15  5:53     ` [PATCH v2 07/10] config: define new option index.try_decrypt Daniel Kahn Gillmor
2017-09-23 16:17       ` Jani Nikula
2017-09-15  5:53     ` [PATCH v2 08/10] cli/new: add --try-decrypt=(true|false) Daniel Kahn Gillmor
2017-09-23 16:46       ` Jani Nikula
2017-09-15  5:53     ` [PATCH v2 09/10] cli/insert: " Daniel Kahn Gillmor
2017-09-15  5:53     ` [PATCH v2 10/10] cli/reindex: " Daniel Kahn Gillmor
2017-10-10  5:49     ` cleartext indexing, round 3 Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 01/15] crypto: rename notmuch_crypto_t to _notmuch_crypto_t Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 02/15] crypto: drop pretense of notmuch_crypto_context_t Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 03/15] crypto: _notmuch_crypto_cleanup should return void Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 04/15] crypto: move into libutil Daniel Kahn Gillmor
2017-10-12 10:54         ` David Bremner
2017-10-12 14:07           ` Daniel Kahn Gillmor
2017-10-12 21:07             ` David Bremner
2017-10-10  5:49       ` [PATCH v3 05/15] gmime-extra: remove duplicate GMimeAddressType typedef Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 06/15] crypto: make shared crypto code behave library-like Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 07/15] tests: prepare for more crypto tests (using add_gnupg_home) Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 08/15] index: implement notmuch_indexopts_t with try_decrypt Daniel Kahn Gillmor
2017-10-11  0:29         ` avoid double typedef Daniel Kahn Gillmor
2017-10-11  0:30           ` [PATCH v4 08/15] index: implement notmuch_indexopts_t with try_decrypt Daniel Kahn Gillmor
2017-10-12 11:18             ` David Bremner
2017-10-12 14:30               ` Daniel Kahn Gillmor
2017-10-11  6:22           ` avoid double typedef Tomi Ollila
2017-10-10  5:49       ` [PATCH v3 09/15] gmime-extra: drop compat layer for g_mime_multipart_encrypted_decrypt Daniel Kahn Gillmor
2017-10-14 14:02         ` David Bremner
2017-10-10  5:49       ` [PATCH v3 10/15] crypto: index encrypted parts when indexopts try_decrypt is set Daniel Kahn Gillmor
2017-10-13  1:08         ` David Bremner
2017-10-13 14:35           ` Daniel Kahn Gillmor
2017-10-13 15:19             ` David Bremner
2017-10-14 11:15             ` David Bremner
2017-10-10  5:49       ` [PATCH v3 11/15] config: indexing defaults will be stored in the database Daniel Kahn Gillmor
2017-10-14 18:08         ` David Bremner
2017-10-15  6:28           ` Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 12/15] config: define new option index.try_decrypt Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 13/15] cli/new: add --try-decrypt=(true|false) Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 14/15] cli/insert: " Daniel Kahn Gillmor
2017-10-10  5:49       ` [PATCH v3 15/15] cli/reindex: " Daniel Kahn Gillmor
2017-10-10 15:50       ` cleartext indexing, round 3 Jameson Graef Rollins
2017-10-10 16:47         ` Daniel Kahn Gillmor
2017-10-13  1:28       ` David Bremner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://notmuchmail.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wp4pfmsd.fsf@nikula.org \
    --to=jani@nikula.org \
    --cc=dkg@fifthhorseman.net \
    --cc=notmuch@notmuchmail.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://yhetil.org/notmuch.git/

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).