tests: streamline ZDOTDIR layout, AUTOENV_ENV_FILENAME via setup

Without this, a new subshell would reset the env authentication file.

diff --git a/tests/ZDOTDIR.clobber/.zshenv b/tests/ZDOTDIR.clobber/.zshenv
index 62037dcbb95fbd875c795cd6b6a58bc6257764ce..84c8c2245eb7dd0ceda93c06c1903b672b4d3efa 100644 (file)
--- a/tests/ZDOTDIR.clobber/.zshenv
+++ b/tests/ZDOTDIR.clobber/.zshenv
@@ -1,3 +1,4 @@
+# Source base setup.
 source ${ZDOTDIR}/../ZDOTDIR/.zshenv
 
 setopt noclobber

diff --git a/tests/ZDOTDIR.invalid-module_path/.zshenv b/tests/ZDOTDIR.invalid-module_path/.zshenv
index baa1de65c71abe9a6c95205c3a0ebc9fc95eeeaa..90f1bd1dcfa68c76e5380b68808390977edd3dc6 100644 (file)
--- a/tests/ZDOTDIR.invalid-module_path/.zshenv
+++ b/tests/ZDOTDIR.invalid-module_path/.zshenv
@@ -10,4 +10,5 @@ zstat() {
   echo "Should not get called."
 }
 
+# Source base setup.
 source ${ZDOTDIR}/../ZDOTDIR/.zshenv

diff --git a/tests/ZDOTDIR.loadviafunction/.zshenv b/tests/ZDOTDIR.loadviafunction/.zshenv
index 8f836b576731accd240846fa3af59f245a7029e3..9ff23713d0e710587ac6797da270356d31f0276a 100644 (file)
--- a/tests/ZDOTDIR.loadviafunction/.zshenv
+++ b/tests/ZDOTDIR.loadviafunction/.zshenv
@@ -1,11 +1,7 @@
-test -f "$TESTDIR/.zcompdump" && rm "$TESTDIR/.zcompdump"
-
-AUTOENV_DEBUG=0
+# Source base setup.
+source ${ZDOTDIR}/../ZDOTDIR/.zshenv
 
 antigen-like-loader-function() {
   source "$TESTDIR/../autoenv.plugin.zsh"
 }
-
-export AUTOENV_ENV_FILENAME="$PWD/.env_auth"
-
-echo -n > $AUTOENV_ENV_FILENAME
+TEST_SOURCE_AUTOENV=antigen-like-loader-function

diff --git a/tests/ZDOTDIR/.zshenv b/tests/ZDOTDIR/.zshenv
index 07e8b5bf2048a9b3979183c815ee99a3dbe2fcf2..d99243d7813f6ccb726d2e660c40d5d578e371d9 100644 (file)
--- a/tests/ZDOTDIR/.zshenv
+++ b/tests/ZDOTDIR/.zshenv
@@ -1,7 +1,3 @@
-test -f "$TESTDIR/.zcompdump" && rm "$TESTDIR/.zcompdump"
+# Base setup/config.
 
-AUTOENV_DEBUG=0
-
-export AUTOENV_ENV_FILENAME="$PWD/.env_auth"
-
-echo -n > $AUTOENV_ENV_FILENAME
+TEST_SOURCE_AUTOENV=(source $TESTDIR/../autoenv.plugin.zsh)

diff --git a/tests/setup.zsh b/tests/setup.zsh
index 27ba4239c446bdab4a71530af6210d5029e4edd4..d8a018e173d0d26115c03107bcdf4598c63c93b5 100644 (file)
--- a/tests/setup.zsh
+++ b/tests/setup.zsh
@@ -9,6 +9,8 @@
 # Not handled in varstash yet.
 # setopt nounset
 
+export AUTOENV_ENV_FILENAME="$CRAMTMP/.env_auth"
+
 if [[ $AUTOENV_ENV_FILENAME[0,4] != '/tmp' ]]; then
   echo "AUTOENV_ENV_FILENAME is not in /tmp. Aborting."
   return 1
@@ -18,11 +20,7 @@ fi
 _save_errexit=${options[errexit]}
 set -e
 
-if (( ${+functions[antigen-like-loader-function]} )); then
-  TEST_SOURCE_AUTOENV=antigen-like-loader-function
-else
-  TEST_SOURCE_AUTOENV=(source $TESTDIR/../autoenv.plugin.zsh)
-fi
+# Defined in .zshenv, e.g. tests/ZDOTDIR/.zshenv.
 $TEST_SOURCE_AUTOENV
 
 # Reset any authentication.