1 files changed, 29 insertions, 3 deletions
diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py
index 437529b8..53b13047 100644
--- a/service/test/functional/features/environment.py
+++ b/service/test/functional/features/environment.py
@@ -16,25 +16,37 @@
 import logging
 import uuid
 
+from crochet import setup, wait_for
+from leap.common.events.server import ensure_server
+from twisted.internet import defer
 from test.support.dispatcher.proxy import Proxy
 from test.support.integration import AppTestClient
 from selenium import webdriver
 
 from pixelated.resources.features_resource import FeaturesResource
+from steps.common import *
+
+setup()
+
+
+@wait_for(timeout=5.0)
+def start_app_test_client(client):
+    ensure_server()
+    return client.start_client()
 
 
 def before_all(context):
     logging.disable('INFO')
     client = AppTestClient()
+    start_app_test_client(client)
+    client.listenTCP()
     proxy = Proxy(proxy_port='8889', app_port='4567')
     FeaturesResource.DISABLED_FEATURES.append('autoRefresh')
     context.client = client
     context.call_to_terminate_proxy = proxy.run_on_a_thread()
-    context.call_to_terminate = client.run_on_a_thread(logfile='/tmp/behave-tests.log')
 
 
 def after_all(context):
-    context.call_to_terminate()
     context.call_to_terminate_proxy()
 
 
@@ -42,7 +54,7 @@ def before_feature(context, feature):
     # context.browser = webdriver.Firefox()
     context.browser = webdriver.PhantomJS()
     context.browser.set_window_size(1280, 1024)
-    context.browser.implicitly_wait(10)
+    context.browser.implicitly_wait(DEFAULT_IMPLICIT_WAIT_TIMEOUT_IN_S)
     context.browser.set_page_load_timeout(60)  # wait for data
     context.browser.get('http://localhost:8889/')
 
@@ -57,6 +69,20 @@ def after_step(context, step):
 def after_feature(context, feature):
     context.browser.quit()
 
+    cleanup_all_mails(context)
+    context.last_mail = None
+
+
+@wait_for(timeout=10.0)
+def cleanup_all_mails(context):
+    @defer.inlineCallbacks
+    def _delete_all_mails():
+        mails = yield context.client.mail_store.all_mails()
+        for mail in mails:
+            yield context.client.mail_store.delete_mail(mail.ident)
+
+    return _delete_all_mails()
+
 
 def save_source(context, filename='/tmp/source.html'):
     with open(filename, 'w') as out: