From 09878aa45adf17af10ccbf402d44d65844884630 Mon Sep 17 00:00:00 2001 From: ddm Date: Fri, 27 Dec 2013 17:10:40 +0100 Subject: [PATCH] Revert bzr revid: ddm@openerp.com-20131227161040-wy2s7ydcvt0jxhdb --- addons/website/tests/test_ui.py | 3 ++- addons/website/tests/ui_suite/ui_test_runner.js | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/website/tests/test_ui.py b/addons/website/tests/test_ui.py index 22c5f9643ad..e8c5abee871 100644 --- a/addons/website/tests/test_ui.py +++ b/addons/website/tests/test_ui.py @@ -77,8 +77,9 @@ class WebsiteUiSuite(unittest.TestSuite): last_check_time = time.time() self._options['timeout'] = self._timeout - self._options['port'] = tools.config.get('xmlrpc_port', 80) + #self._options['port'] = tools.config.get('xmlrpc_port', 80) self._options['db'] = tools.config.get('db_name', '') + self._options['host'] = tools.config.get('db_name', 'localhost') # TODO Use correct key self._options['user'] = 'admin' self._options['password'] = tools.config.get('admin_passwd', 'admin') diff --git a/addons/website/tests/ui_suite/ui_test_runner.js b/addons/website/tests/ui_suite/ui_test_runner.js index 8cc925fdfba..a781db54674 100644 --- a/addons/website/tests/ui_suite/ui_test_runner.js +++ b/addons/website/tests/ui_suite/ui_test_runner.js @@ -42,8 +42,6 @@ function run (test) { console.log('{ "event": "error", "message": "'+url+' failed to load"}'); phantom.exit(1); } else { - // TODO Remove - console.log('{ "event": "error", "message": "Testing '+url+'"}'); test(page); } });