Skip to content

Add help and fish mode to e2e interactive mode. #3313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tsachiherman merged 2 commits into from
Dec 16, 2021
Merged

Add help and fish mode to e2e interactive mode. #3313

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2347a25
Add help and fish mode to e2e interactive mode.
winder Dec 14, 2021
0e21aa9
Update test/scripts/e2e.sh
winder Dec 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions test/scripts/e2e.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -117,23 +118,27 @@ 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
"${TEMPDIR}/ve/bin/pip3" install --upgrade py-algorand-sdk cryptography
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
Expand All @@ -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"

Expand Down