Title: [128825] trunk/Tools
- Revision
- 128825
- Author
- [email protected]
- Date
- 2012-09-17 17:00:50 -0700 (Mon, 17 Sep 2012)
Log Message
nrwt: --results-directory isn't getting printed properly
https://bugs.webkit.org/show_bug.cgi?id=96965
Reviewed by Ojan Vafai.
options.results_directory isn't actually initialized with the
default values until after we call print_config(), so this
changes things to print the value directly.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
(run):
* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer.print_config):
* Scripts/webkitpy/layout_tests/views/printing_unittest.py:
(Testprinter.test_print_config):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (128824 => 128825)
--- trunk/Tools/ChangeLog 2012-09-17 23:58:59 UTC (rev 128824)
+++ trunk/Tools/ChangeLog 2012-09-18 00:00:50 UTC (rev 128825)
@@ -1,3 +1,21 @@
+2012-09-17 Dirk Pranke <[email protected]>
+
+ nrwt: --results-directory isn't getting printed properly
+ https://bugs.webkit.org/show_bug.cgi?id=96965
+
+ Reviewed by Ojan Vafai.
+
+ options.results_directory isn't actually initialized with the
+ default values until after we call print_config(), so this
+ changes things to print the value directly.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (run):
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ (Printer.print_config):
+ * Scripts/webkitpy/layout_tests/views/printing_unittest.py:
+ (Testprinter.test_print_config):
+
2012-09-17 Rob Buis <[email protected]>
[BlackBerry] Enable VIDEO_TRACK
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (128824 => 128825)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-09-17 23:58:59 UTC (rev 128824)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-09-18 00:00:50 UTC (rev 128825)
@@ -105,7 +105,7 @@
unexpected_result_count = -1
manager = Manager(port, options, printer)
- printer.print_config()
+ printer.print_config(port.results_directory())
unexpected_result_count = manager.run(args)
_log.debug("Testing completed, Exit status: %d" % unexpected_result_count)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (128824 => 128825)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-09-17 23:58:59 UTC (rev 128824)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-09-18 00:00:50 UTC (rev 128825)
@@ -83,10 +83,10 @@
def __del__(self):
self.cleanup()
- def print_config(self):
+ def print_config(self, results_directory):
self._print_default("Using port '%s'" % self._port.name())
self._print_default("Test configuration: %s" % self._port.test_configuration())
- self._print_default("Placing test results in %s" % self._options.results_directory)
+ self._print_default("Placing test results in %s" % results_directory)
# FIXME: should these options be in printing_options?
if self._options.new_baseline:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py (128824 => 128825)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py 2012-09-17 23:58:59 UTC (rev 128824)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing_unittest.py 2012-09-18 00:00:50 UTC (rev 128825)
@@ -114,17 +114,23 @@
def test_print_config(self):
printer, err, out = self.get_printer()
# FIXME: it's lame that i have to set these options directly.
- printer._options.results_directory = '/tmp'
printer._options.pixel_tests = True
printer._options.new_baseline = True
printer._options.time_out_ms = 6000
printer._options.slow_time_out_ms = 12000
- printer.print_config()
+ printer.print_config('/tmp')
+ self.assertTrue("Using port 'test-mac-leopard'" in err.getvalue())
+ self.assertTrue('Test configuration: <leopard, x86, release>' in err.getvalue())
+ self.assertTrue('Placing test results in /tmp' in err.getvalue())
self.assertTrue('Baseline search path: test-mac-leopard -> test-mac-snowleopard -> generic' in err.getvalue())
+ self.assertTrue('Using Release build' in err.getvalue())
+ self.assertTrue('Pixel tests enabled' in err.getvalue())
+ self.assertTrue('Command line:' in err.getvalue())
+ self.assertTrue('Regular timeout: ' in err.getvalue())
self.reset(err)
printer._options.quiet = True
- printer.print_config()
+ printer.print_config('/tmp')
self.assertFalse('Baseline search path: test-mac-leopard -> test-mac-snowleopard -> generic' in err.getvalue())
def test_print_one_line_summary(self):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
