Title: [136732] trunk/Tools
- Revision
- 136732
- Author
- [email protected]
- Date
- 2012-12-05 12:22:23 -0800 (Wed, 05 Dec 2012)
Log Message
nrwt: remove two unused parameters from a function
https://bugs.webkit.org/show_bug.cgi?id=104059
Reviewed by Ryosuke Niwa.
Also remove an old, stale FIXME.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(interpret_test_failures):
(summarize_results):
* Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
(ResultSummaryTest.test_interpret_test_failures):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (136731 => 136732)
--- trunk/Tools/ChangeLog 2012-12-05 20:19:09 UTC (rev 136731)
+++ trunk/Tools/ChangeLog 2012-12-05 20:22:23 UTC (rev 136732)
@@ -1,5 +1,20 @@
2012-12-05 Dirk Pranke <[email protected]>
+ nrwt: remove two unused parameters from a function
+ https://bugs.webkit.org/show_bug.cgi?id=104059
+
+ Reviewed by Ryosuke Niwa.
+
+ Also remove an old, stale FIXME.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (interpret_test_failures):
+ (summarize_results):
+ * Scripts/webkitpy/layout_tests/controllers/manager_unittest.py:
+ (ResultSummaryTest.test_interpret_test_failures):
+
+2012-12-05 Dirk Pranke <[email protected]>
+
nrwt: return result_summaries from LayoutTestRunner.run_tests()
https://bugs.webkit.org/show_bug.cgi?id=104051
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (136731 => 136732)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-12-05 20:19:09 UTC (rev 136731)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2012-12-05 20:22:23 UTC (rev 136732)
@@ -56,16 +56,7 @@
TestExpectations = test_expectations.TestExpectations
-def interpret_test_failures(port, test_name, failures):
- """Interpret test failures and returns a test result as dict.
-
- Args:
- port: interface to port-specific hooks
- test_name: test name relative to layout_tests directory
- failures: list of test failures
- Returns:
- A dictionary like {'is_missing_text': True, ...}
- """
+def interpret_test_failures(failures):
test_dict = {}
failure_types = [type(failure) for failure in failures]
# FIXME: get rid of all this is_* values once there is a 1:1 map between
@@ -188,10 +179,8 @@
test_dict['expected'] = expected
test_dict['actual'] = " ".join(actual)
- # FIXME: Set this correctly once https://webkit.org/b/37739 is fixed
- # and only set it if there actually is stderr data.
- test_dict.update(interpret_test_failures(port_obj, test_name, result.failures))
+ test_dict.update(interpret_test_failures(result.failures))
# Store test hierarchically by directory. e.g.
# foo/bar/baz.html: test_dict
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py (136731 => 136732)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2012-12-05 20:19:09 UTC (rev 136731)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py 2012-12-05 20:22:23 UTC (rev 136732)
@@ -99,32 +99,25 @@
self.port = host.port_factory.get(port_name='test')
def test_interpret_test_failures(self):
- test_dict = interpret_test_failures(self.port, 'foo/reftest.html',
- [test_failures.FailureImageHashMismatch(diff_percent=0.42)])
+ test_dict = interpret_test_failures([test_failures.FailureImageHashMismatch(diff_percent=0.42)])
self.assertEqual(test_dict['image_diff_percent'], 0.42)
- test_dict = interpret_test_failures(self.port, 'foo/reftest.html',
- [test_failures.FailureReftestMismatch(self.port.abspath_for_test('foo/reftest-expected.html'))])
+ test_dict = interpret_test_failures([test_failures.FailureReftestMismatch(self.port.abspath_for_test('foo/reftest-expected.html'))])
self.assertTrue('image_diff_percent' in test_dict)
- test_dict = interpret_test_failures(self.port, 'foo/reftest.html',
- [test_failures.FailureReftestMismatchDidNotOccur(self.port.abspath_for_test('foo/reftest-expected-mismatch.html'))])
+ test_dict = interpret_test_failures([test_failures.FailureReftestMismatchDidNotOccur(self.port.abspath_for_test('foo/reftest-expected-mismatch.html'))])
self.assertEqual(len(test_dict), 0)
- test_dict = interpret_test_failures(self.port, 'foo/audio-test.html',
- [test_failures.FailureMissingAudio()])
+ test_dict = interpret_test_failures([test_failures.FailureMissingAudio()])
self.assertTrue('is_missing_audio' in test_dict)
- test_dict = interpret_test_failures(self.port, 'foo/text-test.html',
- [test_failures.FailureMissingResult()])
+ test_dict = interpret_test_failures([test_failures.FailureMissingResult()])
self.assertTrue('is_missing_text' in test_dict)
- test_dict = interpret_test_failures(self.port, 'foo/pixel-test.html',
- [test_failures.FailureMissingImage()])
+ test_dict = interpret_test_failures([test_failures.FailureMissingImage()])
self.assertTrue('is_missing_image' in test_dict)
- test_dict = interpret_test_failures(self.port, 'foo/pixel-test.html',
- [test_failures.FailureMissingImageHash()])
+ test_dict = interpret_test_failures([test_failures.FailureMissingImageHash()])
self.assertTrue('is_missing_image' in test_dict)
def get_result(self, test_name, result_type=test_expectations.PASS, run_time=0):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
