Changeset ae38a49 in mod_gnutls for test

Timestamp:

Jul 2, 2015, 11:13:59 AM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

7adbcd7

Parents:

e021722

Message:

Test suite: Use PID file to manage MSVA process

File:

• test/runtests (modified) (4 diffs)

test/runtests

@@ -1 +1 @@
 #!/bin/bash
 
-# Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Authors:
+# Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+# Thomas Klute <thomas2.klute@uni-dortmund.de>
 
 set -e
@@ -24 +26 @@
 fi
 
-function stop_msva() {
-    kill %1
+function stop_msva()
+{
+    kill_by_pidfile "${msva_pidfile}"
+    unset msva_pidfile
 }
 
@@ -108 +112 @@
 
 if [ -n "${USE_MSVA}" ]; then
-    GNUPGHOME=msva.gnupghome MSVA_KEYSERVER_POLICY=never monkeysphere-validation-agent &
+    msva_pidfile="$(mktemp mod_gnutls_test-XXXXXX.pid)"
+    GNUPGHOME=msva.gnupghome MSVA_KEYSERVER_POLICY=never run_with_pidfile "${msva_pidfile}" monkeysphere-validation-agent &
     trap stop_msva EXIT
 
@@ -189 +194 @@
 if [ -n "${USE_MSVA}" ]; then
     stop_msva
-fi
+    # Without explicitly resetting the trap function, it would be
+    # called again on exit. Of course, we could just not stop MSVA and
+    # let the trap do the work, but I think the code is easier to
+    # understand like this.
+    trap - EXIT
+fi