Title: [90973] trunk/Tools
- Revision
- 90973
- Author
- [email protected]
- Date
- 2011-07-13 19:32:52 -0700 (Wed, 13 Jul 2011)
Log Message
new-run-webkit-tests: print baseline search path as part of config output
https://bugs.webkit.org/show_bug.cgi?id=64499
Reviewed by Eric Seidel.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
* Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90972 => 90973)
--- trunk/Tools/ChangeLog 2011-07-14 02:25:55 UTC (rev 90972)
+++ trunk/Tools/ChangeLog 2011-07-14 02:32:52 UTC (rev 90973)
@@ -1,3 +1,13 @@
+2011-07-13 Dirk Pranke <[email protected]>
+
+ new-run-webkit-tests: print baseline search path as part of config output
+ https://bugs.webkit.org/show_bug.cgi?id=64499
+
+ Reviewed by Eric Seidel.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ * Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
+
2011-07-13 Adam Barth <[email protected]>
gardening server should have an API for parsing changelogs
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (90972 => 90973)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-07-14 02:25:55 UTC (rev 90972)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2011-07-14 02:32:52 UTC (rev 90973)
@@ -1099,6 +1099,10 @@
if self._options.new_baseline:
p.print_config("Placing new baselines in %s" %
self._port.baseline_path())
+
+ fallback_path = [self._fs.split(x)[1] for x in self._port.baseline_search_path()]
+ p.print_config("Baseline search path: %s -> generic" % " -> ".join(fallback_path))
+
p.print_config("Using %s build" % self._options.configuration)
if self._options.pixel_tests:
p.print_config("Pixel tests enabled")
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py (90972 => 90973)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2011-07-14 02:25:55 UTC (rev 90972)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2011-07-14 02:32:52 UTC (rev 90973)
@@ -141,6 +141,28 @@
class ManagerTest(unittest.TestCase):
+ def get_options(self):
+ return MockOptions(pixel_tests=False, new_baseline=False, time_out_ms=6000, slow_time_out_ms=30000, worker_model='inline')
+
+ def get_printer(self):
+ class FakePrinter(object):
+ def __init__(self):
+ self.output = []
+
+ def print_config(self, msg):
+ self.output.append(msg)
+
+ return FakePrinter()
+
+ def test_fallback_path_in_config(self):
+ options = self.get_options()
+
+ port = layout_tests.port.get('test-mac-leopard', options=options)
+ printer = self.get_printer()
+ manager = Manager(port, port.options, printer)
+ manager.print_config()
+ self.assertTrue('Baseline search path: test-mac-leopard -> test-mac-snowleopard -> generic' in printer.output)
+
def test_http_locking(tester):
class LockCheckingManager(Manager):
def __init__(self, port, options, printer):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
