From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Mon, 6 Apr 2009 06:37:34 +0000 (-0700)
Subject: couple of modifications to the test:
X-Git-Tag: monkeysphere_0.25~31^2~16
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=06d5d37ffe25f4f66b58bbf1e4e51fa276ba4996;p=monkeysphere.git

couple of modifications to the test:
- unset MONKEYSPHERE_SUBKEYS_FOR_AGENT, since it will confuse the test
into trying to add the user's key to the agent.
- use cpio to copy a full directory tree, instead of cp -a, since cp
on Darwin doesn't understand the -a option.
---

diff --git a/tests/basic b/tests/basic
index 7277168..f38c9ac 100755
--- a/tests/basic
+++ b/tests/basic
@@ -129,6 +129,10 @@ export MONKEYSPHERE_LOG_LEVEL=DEBUG
 export MONKEYSPHERE_CORE_KEYLENGTH=1024
 export MONKEYSPHERE_PROMPT=false
 
+# unset SUBKEYS_FOR_AGENT variable which, if set, would confuse the
+# into trying to use the user's key, instead of the testuser's key
+unset MONKEYSPHERE_SUBKEYS_FOR_AGENT
+
 export SSHD_CONFIG="$TEMPDIR"/sshd_config
 export SOCKET="$TEMPDIR"/ssh-socket
 
@@ -146,7 +150,8 @@ export DISPLAY=monkeys
 echo
 echo "##################################################"
 echo "### configuring testuser home..."
-cp -a "$TESTDIR"/home/testuser "$TEMPDIR"/
+(cd "$TESTDIR"/home && find testuser | cpio -pdu "$TEMPDIR")
+
 # set up environment for testuser
 export TESTHOME="$TEMPDIR"/testuser
 export GNUPGHOME="$TESTHOME"/.gnupg
@@ -166,7 +171,7 @@ get_gpg_prng_arg >> "$GNUPGHOME"/gpg.conf
 echo
 echo "##################################################"
 echo "### configuring admin home..."
-cp -a "$TESTDIR"/home/admin "$TEMPDIR"/
+(cd "$TESTDIR"/home && find admin | cpio -pdu "$TEMPDIR")
 
 # set up sshd
 echo