From 425d6a54e13be2cdcd18f1b21a4ff70ae5d43ff0 Mon Sep 17 00:00:00 2001 From: Bruno Wagner Date: Wed, 19 Oct 2016 16:56:43 -0200 Subject: Adapted logging in the UA to use twisted.logger --- service/test/functional/features/environment.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'service/test/functional/features/environment.py') diff --git a/service/test/functional/features/environment.py b/service/test/functional/features/environment.py index 41f2c8c7..77efc499 100644 --- a/service/test/functional/features/environment.py +++ b/service/test/functional/features/environment.py @@ -13,24 +13,32 @@ # # You should have received a copy of the GNU Affero General Public License # along with Pixelated. If not, see . -import logging import uuid +import os +from selenium import webdriver from crochet import setup, wait_for -from leap.common.events.server import ensure_server + from twisted.internet import defer +from twisted.logger import globalLogBeginner, textFileLogObserver, Logger -from pixelated.application import UserAgentMode -from pixelated.config.site import PixelatedSite from test.support.integration import AppTestClient -from selenium import webdriver +from steps.common import * +from leap.common.events.server import ensure_server + +from pixelated.application import UserAgentMode +from pixelated.config.site import PixelatedSite from pixelated.resources.features_resource import FeaturesResource -from steps.common import * -import os setup() +observers = [textFileLogObserver(open(os.devnull, 'w'))] + +globalLogBeginner.beginLoggingTo(observers) + +Logger('twisted') + @wait_for(timeout=5.0) def start_app_test_client(client, mode): @@ -39,7 +47,6 @@ def start_app_test_client(client, mode): def before_all(context): ensure_server() - logging.disable('INFO') PixelatedSite.disable_csp_requests() client = AppTestClient() start_app_test_client(client, UserAgentMode(is_single_user=True)) -- cgit v1.2.3