Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
jrollins committed Apr 6, 2009
1 parent 1e17185 commit 06d5d37
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions tests/basic
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 06d5d37

Please sign in to comment.