Title: [94863] trunk/Tools
- Revision
- 94863
- Author
- commit-qu...@webkit.org
- Date
- 2011-09-09 11:00:12 -0700 (Fri, 09 Sep 2011)
Log Message
[NRWT] the nrwt check httpd with --no-http option
https://bugs.webkit.org/show_bug.cgi?id=67835
Patch by Kristóf Kosztyó <kkris...@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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (94862 => 94863)
--- trunk/Tools/ChangeLog 2011-09-09 17:37:05 UTC (rev 94862)
+++ trunk/Tools/ChangeLog 2011-09-09 18:00:12 UTC (rev 94863)
@@ -1,3 +1,13 @@
+2011-09-09 Kristóf Kosztyó <kkris...@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 <zheng...@chromium.org>
[chromium] Implement DRT support for Android.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (94862 => 94863)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-09-09 17:37:05 UTC (rev 94862)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-09-09 18:00:12 UTC (rev 94863)
@@ -817,7 +817,7 @@
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.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py (94862 => 94863)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2011-09-09 17:37:05 UTC (rev 94862)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2011-09-09 18:00:12 UTC (rev 94863)
@@ -227,7 +227,7 @@
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 @@
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
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
