<!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>[159998] 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/159998">159998</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-03 04:40:31 -0800 (Tue, 03 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove get_test() and reference test names directly instead.
https://bugs.webkit.org/show_bug.cgi?id=124962
Patch by Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu> on 2013-12-03
Reviewed by Csaba Osztrogonác.
* Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
(Base.__init__):
(Base.get_basic_tests):
(assert_exp):
(MiscTests.test_multiple_results):
(MiscTests.test_category_expectations):
(MiscTests.test_get_modifiers):
(MiscTests.test_get_expectations_string):
(MiscTests.test_get_test_set):
(MiscTests.test_parse_warning):
(MiscTests.test_pixel_tests_flag.match):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_expectations_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (159997 => 159998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-03 12:30:22 UTC (rev 159997)
+++ trunk/Tools/ChangeLog 2013-12-03 12:40:31 UTC (rev 159998)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-03 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>
+
+ Remove get_test() and reference test names directly instead.
+ https://bugs.webkit.org/show_bug.cgi?id=124962
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py:
+ (Base.__init__):
+ (Base.get_basic_tests):
+ (assert_exp):
+ (MiscTests.test_multiple_results):
+ (MiscTests.test_category_expectations):
+ (MiscTests.test_get_modifiers):
+ (MiscTests.test_get_expectations_string):
+ (MiscTests.test_get_test_set):
+ (MiscTests.test_parse_warning):
+ (MiscTests.test_pixel_tests_flag.match):
+
</ins><span class="cx"> 2013-12-03 Gergo Balogh <geryxyz@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Style Checker false pass.
</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 (159997 => 159998)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py 2013-12-03 12:30:22 UTC (rev 159997)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py 2013-12-03 12:40:31 UTC (rev 159998)
</span><span class="lines">@@ -53,17 +53,13 @@
</span><span class="cx"> self._exp = None
</span><span class="cx"> unittest.TestCase.__init__(self, testFunc)
</span><span class="cx">
</span><del>- def get_test(self, test_name):
- # FIXME: Remove this routine and just reference test names directly.
- return test_name
-
</del><span class="cx"> def get_basic_tests(self):
</span><del>- return [self.get_test('failures/expected/text.html'),
- self.get_test('failures/expected/image_checksum.html'),
- self.get_test('failures/expected/crash.html'),
- self.get_test('failures/expected/missing_text.html'),
- self.get_test('failures/expected/image.html'),
- self.get_test('passes/text.html')]
</del><ins>+ return ['failures/expected/text.html',
+ 'failures/expected/image_checksum.html',
+ 'failures/expected/crash.html',
+ 'failures/expected/missing_text.html',
+ 'failures/expected/image.html',
+ 'passes/text.html']
</ins><span class="cx">
</span><span class="cx"> def get_basic_expectations(self):
</span><span class="cx"> return """
</span><span class="lines">@@ -84,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(self.get_test(test)),
</del><ins>+ self.assertEqual(self._exp.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">@@ -104,7 +100,7 @@
</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><span class="cx"> self.assertEqual(self._exp.get_expectations(
</span><del>- self.get_test('failures/expected/text.html')),
</del><ins>+ 'failures/expected/text.html'),
</ins><span class="cx"> set([FAIL, CRASH]))
</span><span class="cx">
</span><span class="cx"> def test_result_was_expected(self):
</span><span class="lines">@@ -140,21 +136,18 @@
</span><span class="cx"> exp_str = 'Bug(x) failures/expected [ WontFix ]'
</span><span class="cx"> self.parse_exp(exp_str)
</span><span class="cx"> test_name = 'failures/expected/unknown-test.html'
</span><del>- unknown_test = self.get_test(test_name)
</del><ins>+ unknown_test = test_name
</ins><span class="cx"> self.assertRaises(KeyError, self._exp.get_expectations,
</span><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(
- self.get_test('passes/text.html')), [])
</del><ins>+ self.assertEqual(self._exp.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(
- self.get_test('failures/expected/text.html')),
- 'FAIL')
</del><ins>+ self.assertEqual(self._exp.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="lines">@@ -167,14 +160,13 @@
</span><span class="cx"> self.parse_exp(self.get_basic_expectations())
</span><span class="cx"> s = self._exp.get_test_set(WONTFIX)
</span><span class="cx"> self.assertEqual(s,
</span><del>- set([self.get_test('failures/expected/crash.html'),
- self.get_test('failures/expected/image_checksum.html')]))
</del><ins>+ set(['failures/expected/crash.html',
+ 'failures/expected/image_checksum.html']))
</ins><span class="cx">
</span><span class="cx"> def test_parse_warning(self):
</span><span class="cx"> try:
</span><span class="cx"> filesystem = self._port.host.filesystem
</span><span class="cx"> filesystem.write_text_file(filesystem.join(self._port.layout_tests_dir(), 'disabled-test.html-disabled'), 'content')
</span><del>- self.get_test('disabled-test.html-disabled'),
</del><span class="cx"> self.parse_exp("[ FOO ] failures/expected/text.html [ Failure ]\n"
</span><span class="cx"> "Bug(rniwa) non-existent-test.html [ Failure ]\n"
</span><span class="cx"> "Bug(rniwa) disabled-test.html-disabled [ ImageOnlyFailure ]", is_lint_mode=True)
</span><span class="lines">@@ -224,7 +216,7 @@
</span><span class="cx"> def test_pixel_tests_flag(self):
</span><span class="cx"> def match(test, result, pixel_tests_enabled):
</span><span class="cx"> return self._exp.matches_an_expected_result(
</span><del>- self.get_test(test), result, pixel_tests_enabled)
</del><ins>+ test, result, pixel_tests_enabled)
</ins><span class="cx">
</span><span class="cx"> self.parse_exp(self.get_basic_expectations())
</span><span class="cx"> self.assertTrue(match('failures/expected/text.html', FAIL, True))
</span></span></pre>
</div>
</div>
</body>
</html>