From e836e3d6f26d1c2bd03d70a4b37a6cce26ebb69f Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@phys.columbia.edu>
Date: Sat, 25 Oct 2008 18:16:38 -0400
Subject: [PATCH] more work on test suite.

---
 tests/basic                         |  17 +++++------------
 tests/home/admin/.gnupg/pubring.gpg | Bin 4331 -> 5349 bytes
 tests/home/admin/.gnupg/trustdb.gpg | Bin 1760 -> 1920 bytes
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/tests/basic b/tests/basic
index 81f3b91..83d6920 100755
--- a/tests/basic
+++ b/tests/basic
@@ -24,17 +24,14 @@ gpgadmin() {
 # cleanup:
 cleanup() {
 
+    echo
     read -p "press enter to cleanup and remove tmp:"
 
-    # FIXME: stop the sshd process
+    echo "### stop sshd..."
+    kill "$SSHD_PID"
 
-    echo
     echo "### removing temp dir..."
     rm -rf "$TEMPDIR"
-
-    # FIXME: how should we clear out the temporary $VARLIB?
-
-    # FIXME: clear out ssh client config file and known hosts.
 }
 
 ## setup trap
@@ -96,9 +93,7 @@ echo y | gpgadmin --command-fd 0 --sign-key "$HOSTKEYID"
 # FIXME: how can we test publish-key without flooding junk into the
 # keyservers?
 
-# indicate that the "Admin's" key is an identity certifier for the
-# host
-
+# add admin as identity certifier for testhost
 echo "### adding admin as certifier..."
 echo y | monkeysphere-server add-identity-certifier "$TESTDIR"/home/admin/.gnupg/pubkey.gpg
 
@@ -114,6 +109,7 @@ EOF
 echo "### starting sshd..."
 socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -d -d -d -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
 
+export SSHD_PID=$!
 
 ### TESTUSER TESTS
 
@@ -131,9 +127,6 @@ echo "### export server key to testuser..."
 gpgadmin --armor --export "$HOSTKEYID" | \
     GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --import
 
-#GNUPGHOME="$TEMPDIR"/testuser/.gnupg gpg --list-keys
-#read -p "?"
-
 # connect to test sshd, using monkeysphere to verify the identity
 # before connection.
 echo "### testuser connecting to sshd socket..."
diff --git a/tests/home/admin/.gnupg/pubring.gpg b/tests/home/admin/.gnupg/pubring.gpg
index 8e10c4ad1cf25ac577b010b66bb1ed246d94fc48..d22babd0333af3b5ec3bafaa2be9fae23145e769 100644
GIT binary patch
delta 927
zcmV;Q17Q5?A>}Es>JWben2iKU1C#Fo1OU=om`zzcVxfhmi6a1i#DL+4$%~iZ3M|3O
z4aE#E-h7+!wVF;Yc?2AZrS3$o_OQEJ+ai9(AFenvMBM(DGhQw-^fun5H0)M%DRuc1
z!B?mqWVi0u`4=pnGpesS8ZSs)40*%7j{Fd|ee!ZMVZCT_6+sMTdIFWhlaFi=F8pJY
zfe9f3lkbzE3m$*Wb^dWN({WnK$OHh$ROON0S3XO1WX4O2*)Pe`3shE6ga5f#AWr6W
zR3(WAV=wF-q^`)*#KtmuJnJ<bsgqCBkxRe5h2{*Rrv?oy!A3~)bMgjefMT0sn^-;p
zOCV|GTsk6-tzpN?^7>X}jt|S(^L$R-^%hn%{d;+2ML~bDA&2Tu<*Qy`BaaN~umS)B
zh@1ov0RjL91p-L}lkWfu2@p2_c(ZT?)4rk21O7clge7fAYhO9y_GQ^3vw4ZHwgc5?
zWZgb2H4jd2h-$)^a}_1G_i&N*s(+|m!km7<MrUn=O)~WA1aROPE0etP&#x1VD^-}d
z9lI=xF5`bD#WkvfF%U3LJMZf9Ey26jjE@fM4)Cv8wYL0gN!su}|Dz!lA7on3BU769
zE_bZ30ssS;jRZ*pn8X1D0GP!hG?NY@I|o2Sc9{NiasCpmIk;LPZ8Gjn560Y-T}I&6
zE+fg<?5kz`7tTFY`7;99R2hiYTmqR;WOuimGk8A<u;p{~wTaAD`FZEj2KobZOSJ``
zdZ*?i6r)c3y6n~00N60pJwgCntE&#4TXwN%|6j(j4QJz>pR)y=t{;<u2_XWQ#FL>5
z9)F><P#<hrEe1+I1O7RG=HEn;`}noLrX>_G@;%mB9}8#$(l}4SfNTpP+7*#Bzz2tE
zHCY8MfLuTfW%X1<8W=BNpvv&Sh1?3`wd#X@uf;w)2kQQcmOqQRe(LgILc{nBFkEjN
zHvHP)I`k9le}zK_!fsgHZojG+EzrEDFMrefHiwfbegJ{)`(jzJ0ssSuoCFX70ssaD
z0!agy#Q+Kk5H|mKvv38|z7ePd0JzTyF0k*ZVP&C!cN~nEo*tXtB~kXThLHp>oMplZ
z$GFsk-gZQ;2pvFe+5!-m#*(~>u~dkhr!-Q3$N^sv&24Lx+-Ztu2zf|uUucEuzcgDD
zqL9#STyOYT#a=Z`AJ#$q-om>aD6Dbqab_O2x^IdktY_lhe6HBFX`BQq!N0Hq000?K
BuR{O;

delta 9
QcmaE=`C4(qD*;9Z02kW>#sB~S

diff --git a/tests/home/admin/.gnupg/trustdb.gpg b/tests/home/admin/.gnupg/trustdb.gpg
index 171a89121997867a735f6db865a92ea842d62434..d46e25f16a65d53ae262b7910896cc5acb172216 100644
GIT binary patch
delta 107
zcmaFB+rTftm|l?1%*@Ej$iTqh$voreM1fL9y@`fW69Z})bvDZ}9%7Z_VKBRN?AJN2
z*y;I!hd$o#6zk>Tbh!;w4+6TA<ycK*M5?n&TGRE<hwkQJKU4az(C~6$6hxjuAE>|x
E0Frkfb^rhX

delta 33
pcmZqRf50oim|l?1%*@Ej$iTqh$vlB~qCn~7UZy3RH5s?F0swyH2sZ!#

-- 
2.25.1