diff options
author | Will Winder <wwinder.unh@gmail.com> | 2021-12-16 16:19:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-16 16:19:26 -0500 |
commit | b73265c952927a3adbd14015d5e388b1a2647ee1 (patch) | |
tree | 74cd330a1ce5fb6b73799c23ce3e72a8e96f3b71 | |
parent | 9a5d5cdedf6293557680350b68fc4b8f43349ffc (diff) |
Add help and fish mode to e2e interactive mode. (#3313)
## Summary
Minor improvements to e2e.sh interactive mode:
* add to -h output
* do not run start stop test in interactive mode
* support fish shell
## Test Plan
Manual testing:
```
~$ ./e2e.sh -i
...
lots of output removed
...
********** READY **********
The test environment is now set. You can now run tests in another terminal.
Configure the environment:
set -g VIRTUAL_ENV "/home/will/go/src/github.com/algorand/go-algorand/tmp/out/e2e/130013-1639576513257/ve"
set -g PATH "$VIRTUAL_ENV/bin:$PATH"
python3 "/home/will/go/src/github.com/algorand/go-algorand/test/scripts"/e2e_client_runner.py "/home/will/go/src/github.com/algorand/go-algorand/test/scripts"/e2e_subs/SCRIPT_FILE_NAME
Press enter to shut down the test environment...
```
-rwxr-xr-x | test/scripts/e2e.sh | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/test/scripts/e2e.sh b/test/scripts/e2e.sh index 0b4844654..05754825e 100755 --- a/test/scripts/e2e.sh +++ b/test/scripts/e2e.sh @@ -22,6 +22,7 @@ Requires: Options: -c Channel of build you are building binaries with this script -n Run tests without building binaries (Binaries are expected in PATH) + -i Start an interactive session for running e2e subs. " NO_BUILD=false while getopts ":c:nhi" opt; do @@ -117,9 +118,6 @@ export GOPATH=$(go env GOPATH) cd "${SCRIPT_PATH}" if [ -z "$E2E_TEST_FILTER" ] || [ "$E2E_TEST_FILTER" == "SCRIPTS" ]; then - ./timeout 200 ./e2e_basic_start_stop.sh - duration "e2e_basic_start_stop.sh" - python3 -m venv "${TEMPDIR}/ve" . "${TEMPDIR}/ve/bin/activate" "${TEMPDIR}/ve/bin/pip3" install --upgrade pip @@ -127,13 +125,20 @@ if [ -z "$E2E_TEST_FILTER" ] || [ "$E2E_TEST_FILTER" == "SCRIPTS" ]; then duration "e2e client setup" if [ $INTERACTIVE ]; then - echo "********** READY **********" - echo "The test environment is now set. Run the tests using the following command on a different terminal after setting the path." - echo "" - echo "export VIRTUAL_ENV=\"${TEMPDIR}/ve\"" - echo "export PATH=\"\$VIRTUAL_ENV/bin:\$PATH\"" + echo -e "\n\n********** READY **********\n\n" + echo "The test environment is now set. You can now run tests in another terminal." + + echo -e "\nConfigure the environment:\n" + if [ "$(basename $SHELL)" == "fish" ]; then + echo "set -g VIRTUAL_ENV \"${TEMPDIR}/ve\"" + echo "set -g PATH \"\$VIRTUAL_ENV/bin:\$PATH\"" + else + echo "export VIRTUAL_ENV=\"${TEMPDIR}/ve\"" + echo "export PATH=\"\$VIRTUAL_ENV/bin:\$PATH\"" + fi + echo "" - echo "${TEMPDIR}/ve/bin/python3" test/scripts/e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} "$SRCROOT"/test/scripts/e2e_subs/SCRIPT_FILE_NAME + echo "python3 \"$SCRIPT_PATH/e2e_client_runner.py\" ${RUN_KMD_WITH_UNSAFE_SCRYPT} \"$SCRIPT_PATH/e2e_subs/SCRIPT_FILE_NAME\"" echo "" echo "Press enter to shut down the test environment..." read a @@ -143,6 +148,9 @@ if [ -z "$E2E_TEST_FILTER" ] || [ "$E2E_TEST_FILTER" == "SCRIPTS" ]; then exit fi + ./timeout 200 ./e2e_basic_start_stop.sh + duration "e2e_basic_start_stop.sh" + "${TEMPDIR}/ve/bin/python3" e2e_client_runner.py ${RUN_KMD_WITH_UNSAFE_SCRYPT} "$SRCROOT"/test/scripts/e2e_subs/*.{sh,py} duration "parallel client runner" |