diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/basic | 9 | ||||
| -rw-r--r-- | tests/common | 2 |
2 files changed, 8 insertions, 3 deletions
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 diff --git a/tests/common b/tests/common index e53c31e..a000c56 100644 --- a/tests/common +++ b/tests/common @@ -3,7 +3,7 @@ failed_cleanup() { # FIXME: can we be more verbose here? echo 'FAILED!' - if [ "$MONKEYSPHERE_TEST_ALLOW_EXAMINATION" = prompt ] ; then + if [ -z "$MONKEYSPHERE_TEST_NO_EXAMINE" ] ; then read -p "press enter to cleanup and remove tmp (or type bash for a subshell to examine): " XX if [ "$XX" = bash ] ; then echo "Entering subshell..." |