From 8ba61926bbe8609c4e5a9c9e5e0b12644880de92 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Mon, 3 Nov 2008 00:36:10 -0500
Subject: set the bash pipefail option in the test script to return the error
 code of the first failed function in a pipe. also add some new web pages that
 need to be filled out.

---
 tests/basic | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests')

diff --git a/tests/basic b/tests/basic
index 289a1b7..d863886 100755
--- a/tests/basic
+++ b/tests/basic
@@ -13,6 +13,7 @@
 
 # all subcommands in this script should complete without failure:
 set -e
+set -o pipefail
 
 ## make sure that the right tools are installed to run the test.  the
 ## test has *more* requirements than plain ol' monkeysphere:
-- 
cgit v1.2.3


From 19dda210d51a9787f7f3cd8fea1f59220bb83859 Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Tue, 4 Nov 2008 12:44:11 -0500
Subject: very minor changes to test script

---
 tests/basic | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/basic b/tests/basic
index d863886..c38a74b 100755
--- a/tests/basic
+++ b/tests/basic
@@ -13,11 +13,11 @@
 
 # all subcommands in this script should complete without failure:
 set -e
+# piped commands should return the code of the first non-zero return
 set -o pipefail
 
 ## make sure that the right tools are installed to run the test.  the
 ## test has *more* requirements than plain ol' monkeysphere:
-
 which socat || { echo "You must have socat installed to run this test." ; exit 1; }
 
 ## FIXME: other checks?
@@ -121,7 +121,6 @@ export MONKEYSPHERE_LOG_LEVEL=DEBUG
 
 export SSHD_CONFIG="$TEMPDIR"/sshd_config
 export SOCKET="$TEMPDIR"/ssh-socket
-export SSHD_PID=
 
 # Make sure $DISPLAY is set to convince ssh and monkeysphere to fall
 # back on $SSH_ASKPASS.  Make sure it's not set to the current actual
-- 
cgit v1.2.3


From 60bb324da7c83092c354a7bb4f66116fddd3790a Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 9 Nov 2008 18:08:23 -0500
Subject: tests/basic ensure that any lingering sshd process will get killed
 off.

---
 tests/basic | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'tests')

diff --git a/tests/basic b/tests/basic
index c38a74b..5ba7a25 100755
--- a/tests/basic
+++ b/tests/basic
@@ -54,6 +54,7 @@ ssh_test() {
 
     # kill the sshd process if it's still running
     kill "$SSHD_PID"
+    SSHD_PID=
 
     set -e
 
@@ -87,9 +88,16 @@ cleanup() {
     echo "### removing temp dir..."
     rm -rf "$TEMPDIR"
 
+    if [ "$SSHD_PID" ] ; then
+	echo "### killing off lingering sshd..."
+	kill "$SSHD_PID"
+    fi
+
     wait
 }
 
+SSHD_PID=
+
 ## setup trap
 trap failed_cleanup EXIT
 
-- 
cgit v1.2.3