[NRWT] the nrwt check httpd with --no-http option

https://bugs.webkit.org/show_bug.cgi?id=67835

Patch by Kristóf Kosztyó <kkristof@inf.u-szeged.hu> on 2011-09-09
Reviewed by Tony Chang.

* Scripts/webkitpy/layout_tests/controllers/manager.py:
* Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@94863 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ae2b1730
2011-09-09 Kristóf Kosztyó <kkristof@inf.u-szeged.hu>
[NRWT] the nrwt check httpd with --no-http option
https://bugs.webkit.org/show_bug.cgi?id=67835
Reviewed by Tony Chang.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
* Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
2011-09-09 Hao Zheng <zhenghao@chromium.org>
[chromium] Implement DRT support for Android.
......@@ -817,7 +817,7 @@ class Manager(object):
return (thread_timings, test_timings, individual_test_timings)
def needs_servers(self):
return any(self._test_requires_lock(test_name) for test_name in self._test_files)
return any(self._test_requires_lock(test_name) for test_name in self._test_files) and self._options.http
def set_up_run(self):
"""Configures the system to be ready to run tests.
......
......@@ -227,7 +227,7 @@ class ManagerTest(unittest.TestCase):
def get_manager_with_tests(test_names):
port = Mock()
port.TEST_PATH_SEPARATOR = '/'
manager = Manager(port, options=MockOptions(), printer=Mock())
manager = Manager(port, options=MockOptions(http=True), printer=Mock())
manager._test_files = set(test_names)
manager._test_files_list = test_names
return manager
......@@ -241,7 +241,7 @@ class ManagerTest(unittest.TestCase):
def integration_test_needs_servers(self):
def get_manager_with_tests(test_names):
port = layout_tests.port.get()
manager = Manager(port, options=MockOptions(test_list=None), printer=Mock())
manager = Manager(port, options=MockOptions(test_list=None, http=True), printer=Mock())
manager.collect_tests(test_names)
return manager
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment