From 823f90735b93ebe22b2031249dafd051462cef02 Mon Sep 17 00:00:00 2001 From: Varac Date: Thu, 30 Nov 2017 21:07:36 +0100 Subject: [test] Fix e2e mail test - Enable XTRACE output of script - Run e2e mail test against ci.leap.se - Remove unused POLKIT variable - Specify MX server for e2e mail test - Fix helo in e2e tests Resolves: #9159 --- tests/e2e/e2e-test-mail.sh | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'tests/e2e') diff --git a/tests/e2e/e2e-test-mail.sh b/tests/e2e/e2e-test-mail.sh index 881aa627..36748930 100755 --- a/tests/e2e/e2e-test-mail.sh +++ b/tests/e2e/e2e-test-mail.sh @@ -31,7 +31,7 @@ set -e # DEBUG -# set -x +set -x # Check if scipt is run in debug mode so we can hide secrets if [[ "$-" =~ 'x' ]] @@ -43,19 +43,20 @@ else xtrace=false fi -#PROVIDER='ci.leap.se' -PROVIDER='mail.bitmask.net' -INVITE_CODE=${BITMASK_INVITE_CODE:?"Need to set BITMASK_INVITE_CODE non-empty"} +PROVIDER='ci.leap.se' BCTL='bitmaskctl' -POLKIT='lxpolkit' LEAP_HOME="$HOME/.config/leap" MAIL_UUID=$(uuidgen) username="tmp_user_$(date +%Y%m%d%H%M%S)" user="${username}@${PROVIDER}" +set +x # Disable xtrace pw="$(head -c 10 < /dev/urandom | base64)" -SWAKS="swaks --h-Subject $MAIL_UUID --silent 2 --helo ci.leap.se -f ci@leap.se -t $user" +INVITE_CODE=${BITMASK_INVITE_CODE:?"Need to set BITMASK_INVITE_CODE non-empty"} +[[ $xtrace == true ]] && set -x # Enable xtrace again only if it was set at beginning of script + +SWAKS="swaks --h-Subject $MAIL_UUID --silent 2 -s ${PROVIDER} --helo leap.se -f ci@leap.se -t $user" # Stop any previously started bitmaskd # and start a new instance @@ -63,10 +64,12 @@ SWAKS="swaks --h-Subject $MAIL_UUID --silent 2 --helo ci.leap.se -f ci@leap.se - [ -d "$LEAP_HOME" ] && rm -rf "$LEAP_HOME" - # XXX skip certificate verification! -- self-signed cert in ci.leap.se SKIP_TWISTED_SSL_CHECK=1 "$BCTL" start +# Show bitmaskd logs +# tail -F "${LEAP_HOME}/bitmaskd.log" & + # Register a new user # Disable xtrace set +x @@ -78,7 +81,11 @@ set +x echo "created user. authenticating..." # Authenticate +# Disable xtrace +set +x "$BCTL" user auth "$user" --pass "$pw" > /dev/null +# Enable xtrace again only if it was set at beginning of script +[[ $xtrace == true ]] && set -x # Note that imap_pw is the same for smtp @@ -90,7 +97,7 @@ imap_pw="None" while [[ $imap_pw == *"None"* ]]; do response=$("$BCTL" mail get_token) - sleep 2 + sleep 10 imap_pw=$(echo "$response" | head -n 1 | sed 's/ */ /g' | cut -d' ' -f 2) done @@ -109,4 +116,4 @@ do sleep 10 done -echo "Succeeded - mail arrived" +echo -e "Succeeded - mail arrived\n\n\n" -- cgit v1.2.3