<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160165] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160165">160165</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-05 02:32:13 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove certain methods from TestExpectations and use TestExpectationsModel instead of them
https://bugs.webkit.org/show_bug.cgi?id=125218
Patch by Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu> on 2013-12-05
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
(LayoutTestFinder.skip_tests):
* Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:
(LayoutTestRunner.run_tests):
(LayoutTestRunner._update_summary_with_result):
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._test_is_slow):
* Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
(JSONLayoutResultsGenerator._insert_failure_summaries):
* Scripts/webkitpy/layout_tests/models/test_expectations.py:
(TestExpectations.get_rebaselining_failures):
* Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
(assert_exp):
(MiscTests.test_multiple_results):
(MiscTests.test_category_expectations):
(MiscTests.test_get_modifiers):
(MiscTests.test_get_expectations_string):
(MiscTests.test_expectation_to_string):
(MiscTests.test_get_test_set):
(MiscTests.test_more_specific_override_resets_skip):
(SkippedTests.check):
* Scripts/webkitpy/layout_tests/models/test_run_results.py:
(TestRunResults.__init__):
(summarize_results):
* Scripts/webkitpy/tool/commands/rebaseline.py:
(RebaselineExpectations._tests_to_rebaseline):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_finderpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_runnerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testslayout_packagejson_layout_results_generatorpy">trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_expectationspy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_expectations_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_run_resultspy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsrebaselinepy">trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/ChangeLog 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2013-12-05 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>
+
+ Remove certain methods from TestExpectations and use TestExpectationsModel instead of them
+ https://bugs.webkit.org/show_bug.cgi?id=125218
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
+ (LayoutTestFinder.skip_tests):
+ * Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py:
+ (LayoutTestRunner.run_tests):
+ (LayoutTestRunner._update_summary_with_result):
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager._test_is_slow):
+ * Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py:
+ (JSONLayoutResultsGenerator._insert_failure_summaries):
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+ (TestExpectations.get_rebaselining_failures):
+ * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
+ (assert_exp):
+ (MiscTests.test_multiple_results):
+ (MiscTests.test_category_expectations):
+ (MiscTests.test_get_modifiers):
+ (MiscTests.test_get_expectations_string):
+ (MiscTests.test_expectation_to_string):
+ (MiscTests.test_get_test_set):
+ (MiscTests.test_more_specific_override_resets_skip):
+ (SkippedTests.check):
+ * Scripts/webkitpy/layout_tests/models/test_run_results.py:
+ (TestRunResults.__init__):
+ (summarize_results):
+ * Scripts/webkitpy/tool/commands/rebaseline.py:
+ (RebaselineExpectations._tests_to_rebaseline):
+
</ins><span class="cx"> 2013-12-04 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Enable HTMLTemplateElement by default
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_finderpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -96,10 +96,10 @@
</span><span class="cx"> def skip_tests(self, paths, all_tests_list, expectations, http_tests):
</span><span class="cx"> all_tests = set(all_tests_list)
</span><span class="cx">
</span><del>- tests_to_skip = expectations.get_tests_with_result_type(test_expectations.SKIP)
</del><ins>+ tests_to_skip = expectations.model().get_tests_with_result_type(test_expectations.SKIP)
</ins><span class="cx"> if self._options.skip_failing_tests:
</span><del>- tests_to_skip.update(expectations.get_tests_with_result_type(test_expectations.FAIL))
- tests_to_skip.update(expectations.get_tests_with_result_type(test_expectations.FLAKY))
</del><ins>+ tests_to_skip.update(expectations.model().get_tests_with_result_type(test_expectations.FAIL))
+ tests_to_skip.update(expectations.model().get_tests_with_result_type(test_expectations.FLAKY))
</ins><span class="cx">
</span><span class="cx"> if self._options.skipped == 'only':
</span><span class="cx"> tests_to_skip = all_tests - tests_to_skip
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerslayout_test_runnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_runner.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> self._printer.num_started = 0
</span><span class="cx">
</span><span class="cx"> if not retrying:
</span><del>- self._printer.print_expected(run_results, self._expectations.get_tests_with_result_type)
</del><ins>+ self._printer.print_expected(run_results, self._expectations.model().get_tests_with_result_type)
</ins><span class="cx">
</span><span class="cx"> for test_name in set(tests_to_skip):
</span><span class="cx"> result = test_results.TestResult(test_name)
</span><span class="lines">@@ -188,8 +188,8 @@
</span><span class="cx"> expected = True
</span><span class="cx"> else:
</span><span class="cx"> expected = self._expectations.matches_an_expected_result(result.test_name, result.type, self._options.pixel_tests or result.reftest_type)
</span><del>- exp_str = self._expectations.get_expectations_string(result.test_name)
- got_str = self._expectations.expectation_to_string(result.type)
</del><ins>+ exp_str = self._expectations.model().get_expectations_string(result.test_name)
+ got_str = self._expectations.model().expectation_to_string(result.type)
</ins><span class="cx">
</span><span class="cx"> run_results.add(result, expected, self._test_is_slow(result.test_name))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> return self._is_http_test(test_file) or self._is_perf_test(test_file)
</span><span class="cx">
</span><span class="cx"> def _test_is_slow(self, test_file):
</span><del>- return self._expectations.has_modifier(test_file, test_expectations.SLOW)
</del><ins>+ return self._expectations.model().has_modifier(test_file, test_expectations.SLOW)
</ins><span class="cx">
</span><span class="cx"> def needs_servers(self, test_names):
</span><span class="cx"> return any(self._test_requires_lock(test_name) for test_name in test_names) and self._options.http
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testslayout_packagejson_layout_results_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_layout_results_generator.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> self._get_failure_summary_entry(test_expectations.NOW),
</span><span class="cx"> self.FIXABLE)
</span><span class="cx"> self._insert_item_into_raw_list(results_for_builder,
</span><del>- len(self._expectations.get_tests_with_timeline(
</del><ins>+ len(self._expectations.model().get_tests_with_timeline(
</ins><span class="cx"> test_expectations.NOW)), self.ALL_FIXABLE_COUNT)
</span><span class="cx"> self._insert_item_into_raw_list(results_for_builder,
</span><span class="cx"> self._get_failure_summary_entry(test_expectations.WONTFIX),
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_expectationspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -884,36 +884,6 @@
</span><span class="cx"> def get_rebaselining_failures(self):
</span><span class="cx"> return self._model.get_test_set(REBASELINE)
</span><span class="cx">
</span><del>- # FIXME: Change the callsites to use TestExpectationsModel and remove.
- def get_expectations(self, test):
- return self._model.get_expectations(test)
-
- # FIXME: Change the callsites to use TestExpectationsModel and remove.
- def has_modifier(self, test, modifier):
- return self._model.has_modifier(test, modifier)
-
- # FIXME: Change the callsites to use TestExpectationsModel and remove.
- def get_tests_with_result_type(self, result_type):
- return self._model.get_tests_with_result_type(result_type)
-
- # FIXME: Change the callsites to use TestExpectationsModel and remove.
- def get_test_set(self, modifier, expectation=None, include_skips=True):
- return self._model.get_test_set(modifier, expectation, include_skips)
-
- # FIXME: Change the callsites to use TestExpectationsModel and remove.
- def get_modifiers(self, test):
- return self._model.get_modifiers(test)
-
- # FIXME: Change the callsites to use TestExpectationsModel and remove.
- def get_tests_with_timeline(self, timeline):
- return self._model.get_tests_with_timeline(timeline)
-
- def get_expectations_string(self, test):
- return self._model.get_expectations_string(test)
-
- def expectation_to_string(self, expectation):
- return self._model.expectation_to_string(expectation)
-
</del><span class="cx"> def matches_an_expected_result(self, test, result, pixel_tests_are_enabled):
</span><span class="cx"> expected_results = self._model.get_expectations(test)
</span><span class="cx"> if not pixel_tests_are_enabled:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_expectations_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> self._exp = TestExpectations(self._port, self.get_basic_tests(), expectations_to_lint=expectations_to_lint)
</span><span class="cx">
</span><span class="cx"> def assert_exp(self, test, result):
</span><del>- self.assertEqual(self._exp.get_expectations(test),
</del><ins>+ self.assertEqual(self._exp.model().get_expectations(test),
</ins><span class="cx"> set([result]))
</span><span class="cx">
</span><span class="cx"> def assert_bad_expectations(self, expectations, overrides=None):
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> class MiscTests(Base):
</span><span class="cx"> def test_multiple_results(self):
</span><span class="cx"> self.parse_exp('Bug(x) failures/expected/text.html [ Crash Failure ]')
</span><del>- self.assertEqual(self._exp.get_expectations(
</del><ins>+ self.assertEqual(self._exp.model().get_expectations(
</ins><span class="cx"> 'failures/expected/text.html'),
</span><span class="cx"> set([FAIL, CRASH]))
</span><span class="cx">
</span><span class="lines">@@ -137,28 +137,28 @@
</span><span class="cx"> self.parse_exp(exp_str)
</span><span class="cx"> test_name = 'failures/expected/unknown-test.html'
</span><span class="cx"> unknown_test = test_name
</span><del>- self.assertRaises(KeyError, self._exp.get_expectations,
</del><ins>+ self.assertRaises(KeyError, self._exp.model().get_expectations,
</ins><span class="cx"> unknown_test)
</span><span class="cx"> self.assert_exp('failures/expected/crash.html', PASS)
</span><span class="cx">
</span><span class="cx"> def test_get_modifiers(self):
</span><span class="cx"> self.parse_exp(self.get_basic_expectations())
</span><del>- self.assertEqual(self._exp.get_modifiers('passes/text.html'), [])
</del><ins>+ self.assertEqual(self._exp.model().get_modifiers('passes/text.html'), [])
</ins><span class="cx">
</span><span class="cx"> def test_get_expectations_string(self):
</span><span class="cx"> self.parse_exp(self.get_basic_expectations())
</span><del>- self.assertEqual(self._exp.get_expectations_string('failures/expected/text.html'), 'FAIL')
</del><ins>+ self.assertEqual(self._exp.model().get_expectations_string('failures/expected/text.html'), 'FAIL')
</ins><span class="cx">
</span><span class="cx"> def test_expectation_to_string(self):
</span><span class="cx"> # Normal cases are handled by other tests.
</span><span class="cx"> self.parse_exp(self.get_basic_expectations())
</span><del>- self.assertRaises(ValueError, self._exp.expectation_to_string,
</del><ins>+ self.assertRaises(ValueError, self._exp.model().expectation_to_string,
</ins><span class="cx"> -1)
</span><span class="cx">
</span><span class="cx"> def test_get_test_set(self):
</span><span class="cx"> # Handle some corner cases for this routine not covered by other tests.
</span><span class="cx"> self.parse_exp(self.get_basic_expectations())
</span><del>- s = self._exp.get_test_set(WONTFIX)
</del><ins>+ s = self._exp.model().get_test_set(WONTFIX)
</ins><span class="cx"> self.assertEqual(s,
</span><span class="cx"> set(['failures/expected/crash.html',
</span><span class="cx"> 'failures/expected/image_checksum.html']))
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> self.assert_exp('failures/expected/text.html', IMAGE)
</span><span class="cx"> self.assertFalse(self._port._filesystem.join(self._port.layout_tests_dir(),
</span><span class="cx"> 'failures/expected/text.html') in
</span><del>- self._exp.get_tests_with_result_type(SKIP))
</del><ins>+ self._exp.model().get_tests_with_result_type(SKIP))
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class SkippedTests(Base):
</span><span class="lines">@@ -253,9 +253,9 @@
</span><span class="cx"> exp = TestExpectations(port, ['failures/expected/text.html'], expectations_to_lint=expectations_to_lint)
</span><span class="cx">
</span><span class="cx"> # Check that the expectation is for BUG_DUMMY SKIP : ... [ Pass ]
</span><del>- self.assertEqual(exp.get_modifiers('failures/expected/text.html'),
</del><ins>+ self.assertEqual(exp.model().get_modifiers('failures/expected/text.html'),
</ins><span class="cx"> [TestExpectationParser.DUMMY_BUG_MODIFIER, TestExpectationParser.SKIP_MODIFIER, TestExpectationParser.WONTFIX_MODIFIER])
</span><del>- self.assertEqual(exp.get_expectations('failures/expected/text.html'), set([PASS]))
</del><ins>+ self.assertEqual(exp.model().get_expectations('failures/expected/text.html'), set([PASS]))
</ins><span class="cx">
</span><span class="cx"> def test_skipped_tests_work(self):
</span><span class="cx"> self.check(expectations='', overrides=None, skips=['failures/expected/text.html'])
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_run_resultspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> for expectation in test_expectations.TestExpectations.EXPECTATIONS.values():
</span><span class="cx"> self.tests_by_expectation[expectation] = set()
</span><span class="cx"> for timeline in test_expectations.TestExpectations.TIMELINES.values():
</span><del>- self.tests_by_timeline[timeline] = expectations.get_tests_with_timeline(timeline)
</del><ins>+ self.tests_by_timeline[timeline] = expectations.model().get_tests_with_timeline(timeline)
</ins><span class="cx"> self.slow_tests = set()
</span><span class="cx"> self.interrupted = False
</span><span class="cx">
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx"> # Note that if a test crashed in the original run, we ignore
</span><span class="cx"> # whether or not it crashed when we retried it (if we retried it),
</span><span class="cx"> # and always consider the result not flaky.
</span><del>- expected = expectations.get_expectations_string(test_name)
</del><ins>+ expected = expectations.model().get_expectations_string(test_name)
</ins><span class="cx"> result_type = result.type
</span><span class="cx"> actual = [keywords[result_type]]
</span><span class="cx">
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> if result.reftest_type:
</span><span class="cx"> test_dict.update(reftest_type=list(result.reftest_type))
</span><span class="cx">
</span><del>- if expectations.has_modifier(test_name, test_expectations.WONTFIX):
</del><ins>+ if expectations.model().has_modifier(test_name, test_expectations.WONTFIX):
</ins><span class="cx"> test_dict['wontfix'] = True
</span><span class="cx">
</span><span class="cx"> if result_type == test_expectations.PASS:
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx"> num_missing += 1
</span><span class="cx"> elif test_name in initial_results.unexpected_results_by_name:
</span><span class="cx"> if retry_results and test_name not in retry_results.unexpected_results_by_name:
</span><del>- actual.extend(expectations.get_expectations_string(test_name).split(" "))
</del><ins>+ actual.extend(expectations.model().get_expectations_string(test_name).split(" "))
</ins><span class="cx"> num_flaky += 1
</span><span class="cx"> elif retry_results:
</span><span class="cx"> retry_result_type = retry_results.unexpected_results_by_name[test_name].type
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> if include_time_and_modifiers:
</span><span class="cx"> test_dict['time'] = round(1000 * result.test_run_time)
</span><span class="cx"> # FIXME: Fix get_modifiers to return modifiers in new format.
</span><del>- test_dict['modifiers'] = ' '.join(expectations.get_modifiers(test_name)).replace('BUGWK', 'webkit.org/b/')
</del><ins>+ test_dict['modifiers'] = ' '.join(expectations.model().get_modifiers(test_name)).replace('BUGWK', 'webkit.org/b/')
</ins><span class="cx">
</span><span class="cx"> test_dict.update(_interpret_test_failures(result.failures))
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsrebaselinepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (160164 => 160165)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2013-12-05 08:49:18 UTC (rev 160164)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2013-12-05 10:32:13 UTC (rev 160165)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> tests_to_rebaseline = {}
</span><span class="cx"> expectations = TestExpectations(port, include_overrides=True)
</span><span class="cx"> for test in expectations.get_rebaselining_failures():
</span><del>- tests_to_rebaseline[test] = TestExpectations.suffixes_for_expectations(expectations.get_expectations(test))
</del><ins>+ tests_to_rebaseline[test] = TestExpectations.suffixes_for_expectations(expectations.model().get_expectations(test))
</ins><span class="cx"> return tests_to_rebaseline
</span><span class="cx">
</span><span class="cx"> def _add_tests_to_rebaseline_for_port(self, port_name):
</span></span></pre>
</div>
</div>
</body>
</html>