From e19be085ca673504e9e0b481eeafaaaf02e45f3f Mon Sep 17 00:00:00 2001 From: Duda Dornelles Date: Thu, 18 Dec 2014 11:46:24 -0200 Subject: Running functional tests behind tornado proxy: breaking the build :) --- service/test/functional/features/environment.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'service/test/functional') diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index a3c28a9b..5dbb89ae 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -14,6 +14,8 @@ # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . import logging +import time +from test.support.dispatcher.proxy import Proxy from test.support.integration import AppTestClient from selenium import webdriver @@ -23,22 +25,25 @@ from pixelated.controllers.features_controller import FeaturesController def before_all(context): logging.disable('INFO') client = AppTestClient() + proxy = Proxy(proxy_port='8889', app_port='4567') FeaturesController.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() def before_feature(context, feature): - # context.browser = webdriver.Firefox() - context.browser = webdriver.PhantomJS() + context.browser = webdriver.Firefox() + # context.browser = webdriver.PhantomJS() context.browser.set_window_size(1280, 1024) context.browser.implicitly_wait(5) context.browser.set_page_load_timeout(60) # wait for data - context.browser.get('http://localhost:4567/') + context.browser.get('http://localhost:8889/') def after_feature(context, feature): -- cgit v1.2.3