Re: [PATCH] t: lib-gpg: flush gpg agent on startup

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 20, 2017, 20:00 UTC
Message-ID: <xmqq379qlvzi.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <20170720170113.fvquowatpv4ms6if@LykOS.localdomain>

Santiago Torres <santiago@nyu.edu> writes:

Show 7 quoted lines

> This is the patch that stemmed from [1].
>
> I tried to keep it simple and not noisy, alhtough it breaks the &&
> chain, it needs to be run right before the --import command. I also
> decided to drop the switch chain in case that regression was to be
> introduced in the future in other versions (hopefully gpgconf goes
> nowhere by then).

I'm inclined to do

	...
	export GNUPGHOME &&
	( gpgconf --kill gpg-agent 2>&1 >/dev/null || : ) &&
	gpg --homedir ... --import ...

Imagine "chmod 0777 ./gpghome" failed and what happens. We skip the part that exports GNUPGHOME and attempts to kill gpg-agent as if nothing bad happened, and then we try to "--import". At that point we do not know what value GNUPGHOME has---are we clobbering the real keychain the user who runs the test has?

With that "run it but ignore the outcome even if we failed to.", we do not have to worry about any of that ;-)

Show 41 quoted lines

>
> I was able to test this on debian oldstable/stable and arch.
>
> Cheers!
> -Santiago.
>
> [1] https://public-inbox.org/git/xmqqvampmnmv.fsf@gitster.mtv.corp.google.com/
>
> On Thu, Jul 20, 2017 at 12:58:14PM -0400, santiago@nyu.edu wrote:
>> From: Santiago Torres <santiago@nyu.edu>
>> 
>> When running gpg-relevant tests, a gpg-daemon is spawned for each
>> GNUPGHOME used. This daemon may stay running after the test and cache
>> file descriptors for the trash directories, even after the trash
>> directory is removed. This leads to ENOENT errors when attempting to
>> create files if tests are run multiple times.
>> 
>> Add a cleanup script to force flushing the gpg-agent for that GNUPGHOME
>> (if any) before setting up the GPG relevant-environment.
>> 
>> Helped-by: Junio C Hamano <gitster@pobox.com>
>> Signed-off-by: Santiago Torres <santiago@nyu.edu>
>> ---
>>  t/lib-gpg.sh | 1 +
>>  1 file changed, 1 insertion(+)
>> 
>> diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
>> index ec2aa8f68..7a6c7ee6f 100755
>> --- a/t/lib-gpg.sh
>> +++ b/t/lib-gpg.sh
>> @@ -31,6 +31,7 @@ then
>>  		chmod 0700 ./gpghome &&
>>  		GNUPGHOME="$(pwd)/gpghome" &&
>>  		export GNUPGHOME &&
>> +		gpgconf --kill gpg-agent 2>&1 >/dev/null
>>  		gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
>>  			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
>>  		gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \
>> -- 
>> 2.13.3
>>