[tests] enable mail e2e again

- skip ssl verification for this test
- use mail.bitmask as e2e provider for now
  (ci.leap.se seems broken; cannot download smtp cert)

3 files changed, 13 insertions, 7 deletions

diff --git a/Makefile b/Makefile
index fbdfc416..0e44505f 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,7 @@ test:
 	tox
 
 test_e2e:
-	#tests/e2e/e2e-test-mail.sh
+	tests/e2e/e2e-test-mail.sh
 	tests/e2e/e2e-test-vpn.sh
 
 install_helpers:
diff --git a/tests/e2e/e2e-test-mail.sh b/tests/e2e/e2e-test-mail.sh
index 7039e648..881aa627 100755
--- a/tests/e2e/e2e-test-mail.sh
+++ b/tests/e2e/e2e-test-mail.sh
@@ -30,6 +30,9 @@
 # exit if any commands returns non-zero status
 set -e
 
+# DEBUG
+# set -x
+
 # Check if scipt is run in debug mode so we can hide secrets
 if [[ "$-" =~ 'x' ]]
 then
@@ -40,7 +43,8 @@ else
   xtrace=false
 fi
 
-PROVIDER='ci.leap.se'
+#PROVIDER='ci.leap.se'
+PROVIDER='mail.bitmask.net'
 INVITE_CODE=${BITMASK_INVITE_CODE:?"Need to set BITMASK_INVITE_CODE non-empty"}
 
 BCTL='bitmaskctl'
@@ -53,25 +57,26 @@ user="${username}@${PROVIDER}"
 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"
 
-# Start the polkit authentication agent
-"$POLKIT" &
-
 # Stop any previously started bitmaskd
 # and start a new instance
 "$BCTL" stop
 
 [ -d "$LEAP_HOME" ] && rm -rf "$LEAP_HOME"
 
-"$BCTL" start
 
-# Register a new user
+# XXX skip certificate verification! -- self-signed cert in ci.leap.se
+SKIP_TWISTED_SSL_CHECK=1 "$BCTL" start
 
+# Register a new user
 # Disable xtrace
 set +x
 "$BCTL" user create "$user" --pass "$pw" --invite "$INVITE_CODE"
 # Enable xtrace again only if it was set at beginning of script
 [[ $xtrace == true ]] && set -x
 
+#tail ~/.config/leap/bitmaskd.log
+echo "created user. authenticating..."
+
 # Authenticate
 "$BCTL" user auth "$user" --pass "$pw" > /dev/null
 
diff --git a/tests/e2e/e2e-test-vpn.sh b/tests/e2e/e2e-test-vpn.sh
index 26be34c8..05c19138 100755
--- a/tests/e2e/e2e-test-vpn.sh
+++ b/tests/e2e/e2e-test-vpn.sh
@@ -21,6 +21,7 @@ fi
 
 PROVIDER='demo.bitmask.net'
 INVITE_CODE=${BITMASK_INVITE_CODE:?"Need to set BITMASK_INVITE_CODE non-empty"}
+
 BCTL='bitmaskctl'
 LEAP_HOME="$HOME/.config/leap"