tests: Use --debug-quick-random for tests

* tests/start-stop-agent: Don't autostart agent on --stop and
running check. Use --debug-quick-random when starting.

--
This should speed up the tests especially on low entropy systems.
Possibly fixing a hang on pythons op_genkey test in the Launchpad
build enviorment (see launchpad issue 1655298)
This commit is contained in:
Andre Heinecke 2017-01-25 14:10:18 +01:00
parent 6f02133bb0
commit a98951a30a

View File

@ -15,11 +15,12 @@ fi
GPG_AGENT_INFO= GPG_AGENT_INFO=
export GPG_AGENT_INFO export GPG_AGENT_INFO
GPG_AGENT=$(which gpg-agent)
token=$(echo "gpgme-$(pwd)" | tr ' ' '_') token=$(echo "gpgme-$(pwd)" | tr ' ' '_')
if [ "$1" = "--stop" ]; then if [ "$1" = "--stop" ]; then
if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \ if [ "$(gpg-connect-agent --no-autostart getval\ $token /bye 2>/dev/null | head -1)" \
!= "D set" ]; then != "D set" ]; then
echo "gpg-agent not running" >&2 echo "gpg-agent not running" >&2
exit 0 exit 0
@ -29,15 +30,16 @@ if [ "$1" = "--stop" ]; then
exit 0 exit 0
fi fi
if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \ if [ "$(gpg-connect-agent --no-autostart getval\ $token /bye 2>/dev/null | head -1)" \
= "D set" ]; then = "D set" ]; then
echo "gpg-agent already running" >&2 echo "gpg-agent already running" >&2
exit 0 exit 0
fi fi
echo "starting gpg-agent " >&2 echo "starting gpg-agent.." >&2
gpg-connect-agent putval\ $token\ set /bye >/dev/null 2>&1
if [ "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \ gpg-connect-agent --agent-program="${GPG_AGENT}|--debug-quick-random" putval\ $token\ set /bye
if [ $? -ne 0 -o "$(gpg-connect-agent getval\ $token /bye 2>/dev/null | head -1)" \
!= "D set" ]; then != "D set" ]; then
echo "error starting gpg-agent" >&2 echo "error starting gpg-agent" >&2
exit 1 exit 1