From 33d5d1b35afb0decedfd33e2c868c20ac25bad78 Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Thu, 22 Dec 2016 19:09:58 +0100
Subject: [test] clean up output of e2e test

---
 tests/e2e/e2e-test.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/e2e/e2e-test.sh b/tests/e2e/e2e-test.sh
index 6e50604..dea4c00 100755
--- a/tests/e2e/e2e-test.sh
+++ b/tests/e2e/e2e-test.sh
@@ -9,9 +9,19 @@
 # as an example:
 #   export FROM_EXTERNAL_OPTS='-f user@example.org --tlsc --au user@example.or -ap MYPASSWORD -s smtp.example.org'
 #
+# then:
+#
+#   source venv/bin/activate
+#   make dev-latest-backend
+#   make test_e2e
+#
+#
 # TODO:
 #   - Timeout waiting for mail
-
+#   - Decrease poll interval
+#   - Make it less noisy (fix the vext warnings)
+#   - move away from cdev.bm
+#   - remove test user on success
 
 set -e
 
@@ -23,7 +33,7 @@ MAIL_UUID=$(uuidgen)
 username="tmp_user_$(date +%Y%m%d%H%M%S)"
 user="${username}@${PROVIDER}"
 pw="$(head -c 10 < /dev/urandom | base64)"
-SWAKS="swaks -t $user --h-Subject $MAIL_UUID"
+SWAKS="swaks -t $user --h-Subject $MAIL_UUID --silent 2"
 
 # Stop any previously started bitmaskd
 # and start a new instance
@@ -38,7 +48,7 @@ rm -rf "$LEAP_HOME"
 "$BCTL" user create "$user" --pass "$pw"
 
 # Authenticate
-"$BCTL" user auth "$user" --pass "$pw"
+"$BCTL" user auth "$user" --pass "$pw" > /dev/null
 
 # Note that imap_pw is the same for smtp
 
@@ -65,6 +75,7 @@ $SWAKS $FROM_EXTERNAL_OPTS
 # wait until we the get mail we just sent.
 while ! ./tests/e2e/getmail --mailbox INBOX --subject "$MAIL_UUID" "$user" "$imap_pw" > /dev/null
 do
+  echo "Waiting for incoming test mail..."
   sleep 10
 done
 
-- 
cgit v1.2.3