<!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>[177034] 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/177034">177034</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-12-09 12:50:16 -0800 (Tue, 09 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove virtual test support from webkitpy
https://bugs.webkit.org/show_bug.cgi?id=139427
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-12-09
Reviewed by Alexey Proskuryakov.
It seems that the only concrete client of virtual tests is the unit tests :D
This patch tries to clean as much useless code as possible.
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
(RunTest.test_tolerance):
(RunTest.test_virtual): Deleted.
* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer._print_test_trace):
* Scripts/webkitpy/port/base.py:
(Port.expected_filename):
(Port.tests):
(Port.test_isfile):
(Port.test_isdir):
(Port.sample_process):
(Port.find_system_pid):
(Port.test_expectations_file_position):
(Port.virtual_test_suites): Deleted.
(Port): Deleted.
(Port.populated_virtual_test_suites): Deleted.
(Port._virtual_tests): Deleted.
(Port.lookup_virtual_test_base): Deleted.
(Port.lookup_virtual_test_args): Deleted.
(VirtualTestSuite): Deleted.
(VirtualTestSuite.__init__): Deleted.
(VirtualTestSuite.__repr__): Deleted.
* Scripts/webkitpy/port/base_unittest.py:
(PortTest.test_test_exists):
(PortTest.test_test_isfile):
(PortTest.test_test_isdir):
(PortTest.test_tests):
* Scripts/webkitpy/port/driver.py:
(DriverProxy.run_test): Deleted.
* Scripts/webkitpy/port/test.py:
(TestPort._skipped_tests_for_unsupported_features):
(TestPort.all_baseline_variants):
(TestPort.virtual_test_suites): Deleted.
* Scripts/webkitpy/tool/commands/queries.py:
(PrintBaselines.__init__):
(PrintBaselines.execute):
* Scripts/webkitpy/tool/commands/queries_unittest.py:
(PrintBaselinesTest.test_basic):
(PrintBaselinesTest.test_multiple):
(PrintBaselinesTest.test_csv):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsrun_webkit_tests_integrationtestpy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsprintingpy">trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbase_unittestpy">trunk/Tools/Scripts/webkitpy/port/base_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyporttestpy">trunk/Tools/Scripts/webkitpy/port/test.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsqueriespy">trunk/Tools/Scripts/webkitpy/tool/commands/queries.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsqueries_unittestpy">trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/ChangeLog 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -1,3 +1,55 @@
</span><ins>+2014-12-09 Benjamin Poulain <bpoulain@apple.com>
+
+ Remove virtual test support from webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=139427
+
+ Reviewed by Alexey Proskuryakov.
+
+ It seems that the only concrete client of virtual tests is the unit tests :D
+
+ This patch tries to clean as much useless code as possible.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ (RunTest.test_tolerance):
+ (RunTest.test_virtual): Deleted.
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ (Printer._print_test_trace):
+ * Scripts/webkitpy/port/base.py:
+ (Port.expected_filename):
+ (Port.tests):
+ (Port.test_isfile):
+ (Port.test_isdir):
+ (Port.sample_process):
+ (Port.find_system_pid):
+ (Port.test_expectations_file_position):
+ (Port.virtual_test_suites): Deleted.
+ (Port): Deleted.
+ (Port.populated_virtual_test_suites): Deleted.
+ (Port._virtual_tests): Deleted.
+ (Port.lookup_virtual_test_base): Deleted.
+ (Port.lookup_virtual_test_args): Deleted.
+ (VirtualTestSuite): Deleted.
+ (VirtualTestSuite.__init__): Deleted.
+ (VirtualTestSuite.__repr__): Deleted.
+ * Scripts/webkitpy/port/base_unittest.py:
+ (PortTest.test_test_exists):
+ (PortTest.test_test_isfile):
+ (PortTest.test_test_isdir):
+ (PortTest.test_tests):
+ * Scripts/webkitpy/port/driver.py:
+ (DriverProxy.run_test): Deleted.
+ * Scripts/webkitpy/port/test.py:
+ (TestPort._skipped_tests_for_unsupported_features):
+ (TestPort.all_baseline_variants):
+ (TestPort.virtual_test_suites): Deleted.
+ * Scripts/webkitpy/tool/commands/queries.py:
+ (PrintBaselines.__init__):
+ (PrintBaselines.execute):
+ * Scripts/webkitpy/tool/commands/queries_unittest.py:
+ (PrintBaselinesTest.test_basic):
+ (PrintBaselinesTest.test_multiple):
+ (PrintBaselinesTest.test_csv):
+
</ins><span class="cx"> 2014-12-09 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Blink Merge: Remove 'http_lock' code from webkitpy
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsrun_webkit_tests_integrationtestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -716,10 +716,6 @@
</span><span class="cx"> test_port = get_port_for_run(base_args)
</span><span class="cx"> self.assertEqual(None, test_port.tolerance_used_for_diff_image)
</span><span class="cx">
</span><del>- def test_virtual(self):
- self.assertTrue(passing_run(['passes/text.html', 'passes/args.html',
- 'virtual/passes/text.html', 'virtual/passes/args.html']))
-
</del><span class="cx"> def test_reftest_run(self):
</span><span class="cx"> tests_run = get_tests_run(['passes/reftest.html'])
</span><span class="cx"> self.assertEqual(['passes/reftest.html'], tests_run)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsprintingpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -350,12 +350,6 @@
</span><span class="cx"> test_name = result.test_name
</span><span class="cx"> self._print_default(self._test_status_line(test_name, ''))
</span><span class="cx">
</span><del>- base = self._port.lookup_virtual_test_base(test_name)
- if base:
- args = ' '.join(self._port.lookup_virtual_test_args(test_name))
- self._print_default(' base: %s' % base)
- self._print_default(' args: %s' % args)
-
</del><span class="cx"> for extension in ('.txt', '.png', '.wav', '.webarchive'):
</span><span class="cx"> self._print_baseline(test_name, extension)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -424,10 +424,6 @@
</span><span class="cx"> if platform_dir:
</span><span class="cx"> return self._filesystem.join(platform_dir, baseline_filename)
</span><span class="cx">
</span><del>- actual_test_name = self.lookup_virtual_test_base(test_name)
- if actual_test_name:
- return self.expected_filename(actual_test_name, suffix)
-
</del><span class="cx"> if return_default:
</span><span class="cx"> return self._filesystem.join(self.layout_tests_dir(), baseline_filename)
</span><span class="cx"> return None
</span><span class="lines">@@ -514,9 +510,7 @@
</span><span class="cx"> def tests(self, paths):
</span><span class="cx"> """Return the list of tests found. Both generic and platform-specific tests matching paths should be returned."""
</span><span class="cx"> expanded_paths = self._expanded_paths(paths)
</span><del>- tests = self._real_tests(expanded_paths)
- tests.extend(self._virtual_tests(expanded_paths, self.populated_virtual_test_suites()))
- return tests
</del><ins>+ return self._real_tests(expanded_paths)
</ins><span class="cx">
</span><span class="cx"> def _expanded_paths(self, paths):
</span><span class="cx"> expanded_paths = []
</span><span class="lines">@@ -599,19 +593,13 @@
</span><span class="cx"> def test_isfile(self, test_name):
</span><span class="cx"> """Return True if the test name refers to a directory of tests."""
</span><span class="cx"> # Used by test_expectations.py to apply rules to whole directories.
</span><del>- if self._filesystem.isfile(self.abspath_for_test(test_name)):
- return True
- base = self.lookup_virtual_test_base(test_name)
- return base and self._filesystem.isfile(self.abspath_for_test(base))
</del><ins>+ return self._filesystem.isfile(self.abspath_for_test(test_name))
</ins><span class="cx">
</span><span class="cx"> @memoized
</span><span class="cx"> def test_isdir(self, test_name):
</span><span class="cx"> """Return True if the test name refers to a directory of tests."""
</span><span class="cx"> # Used by test_expectations.py to apply rules to whole directories.
</span><del>- if self._filesystem.isdir(self.abspath_for_test(test_name)):
- return True
- base = self.lookup_virtual_test_base(test_name)
- return base and self._filesystem.isdir(self.abspath_for_test(base))
</del><ins>+ return self._filesystem.isdir(self.abspath_for_test(test_name))
</ins><span class="cx">
</span><span class="cx"> @memoized
</span><span class="cx"> def test_exists(self, test_name):
</span><span class="lines">@@ -1194,52 +1182,10 @@
</span><span class="cx"> def sample_process(self, name, pid):
</span><span class="cx"> pass
</span><span class="cx">
</span><del>- def virtual_test_suites(self):
- return []
-
</del><span class="cx"> def find_system_pid(self, name, pid):
</span><span class="cx"> # This is only overridden on Windows
</span><span class="cx"> return pid
</span><span class="cx">
</span><del>- @memoized
- def populated_virtual_test_suites(self):
- suites = self.virtual_test_suites()
-
- # Sanity-check the suites to make sure they don't point to other suites.
- suite_dirs = [suite.name for suite in suites]
- for suite in suites:
- assert suite.base not in suite_dirs
-
- for suite in suites:
- base_tests = self._real_tests([suite.base])
- suite.tests = {}
- for test in base_tests:
- suite.tests[test.replace(suite.base, suite.name, 1)] = test
- return suites
-
- def _virtual_tests(self, paths, suites):
- virtual_tests = list()
- for suite in suites:
- if paths:
- for test in suite.tests:
- if any(test.startswith(p) for p in paths):
- virtual_tests.append(test)
- else:
- virtual_tests.extend(suite.tests.keys())
- return virtual_tests
-
- def lookup_virtual_test_base(self, test_name):
- for suite in self.populated_virtual_test_suites():
- if test_name.startswith(suite.name):
- return test_name.replace(suite.name, suite.base, 1)
- return None
-
- def lookup_virtual_test_args(self, test_name):
- for suite in self.populated_virtual_test_suites():
- if test_name.startswith(suite.name):
- return suite.args
- return []
-
</del><span class="cx"> def should_run_as_pixel_test(self, test_input):
</span><span class="cx"> if not self._options.pixel_tests:
</span><span class="cx"> return False
</span><span class="lines">@@ -1392,13 +1338,3 @@
</span><span class="cx"> def test_expectations_file_position(self):
</span><span class="cx"> # By default baseline search path schema is i.e. port-wk2 -> wk2 -> port -> generic, so port expectations file is at second to last position.
</span><span class="cx"> return 1
</span><del>-
-class VirtualTestSuite(object):
- def __init__(self, name, base, args, tests=None):
- self.name = name
- self.base = base
- self.args = args
- self.tests = tests or set()
-
- def __repr__(self):
- return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbase_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base_unittest.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -350,20 +350,12 @@
</span><span class="cx"> self.assertTrue(port.test_exists('passes/text.html'))
</span><span class="cx"> self.assertFalse(port.test_exists('passes/does_not_exist.html'))
</span><span class="cx">
</span><del>- self.assertTrue(port.test_exists('virtual'))
- self.assertFalse(port.test_exists('virtual/does_not_exist.html'))
- self.assertTrue(port.test_exists('virtual/passes/text.html'))
-
</del><span class="cx"> def test_test_isfile(self):
</span><span class="cx"> port = self.make_port(with_tests=True)
</span><span class="cx"> self.assertFalse(port.test_isfile('passes'))
</span><span class="cx"> self.assertTrue(port.test_isfile('passes/text.html'))
</span><span class="cx"> self.assertFalse(port.test_isfile('passes/does_not_exist.html'))
</span><span class="cx">
</span><del>- self.assertFalse(port.test_isfile('virtual'))
- self.assertTrue(port.test_isfile('virtual/passes/text.html'))
- self.assertFalse(port.test_isfile('virtual/does_not_exist.html'))
-
</del><span class="cx"> def test_test_isdir(self):
</span><span class="cx"> port = self.make_port(with_tests=True)
</span><span class="cx"> self.assertTrue(port.test_isdir('passes'))
</span><span class="lines">@@ -371,29 +363,14 @@
</span><span class="cx"> self.assertFalse(port.test_isdir('passes/does_not_exist.html'))
</span><span class="cx"> self.assertFalse(port.test_isdir('passes/does_not_exist/'))
</span><span class="cx">
</span><del>- self.assertTrue(port.test_isdir('virtual'))
- self.assertFalse(port.test_isdir('virtual/does_not_exist.html'))
- self.assertFalse(port.test_isdir('virtual/does_not_exist/'))
- self.assertFalse(port.test_isdir('virtual/passes/text.html'))
-
</del><span class="cx"> def test_tests(self):
</span><span class="cx"> port = self.make_port(with_tests=True)
</span><span class="cx"> tests = port.tests([])
</span><span class="cx"> self.assertIn('passes/text.html', tests)
</span><del>- self.assertIn('virtual/passes/text.html', tests)
</del><span class="cx">
</span><span class="cx"> tests = port.tests(['passes'])
</span><span class="cx"> self.assertIn('passes/text.html', tests)
</span><del>- self.assertIn('passes/passes/test-virtual-passes.html', tests)
- self.assertNotIn('virtual/passes/text.html', tests)
</del><span class="cx">
</span><del>- tests = port.tests(['virtual/passes'])
- self.assertNotIn('passes/text.html', tests)
- self.assertIn('virtual/passes/test-virtual-passes.html', tests)
- self.assertIn('virtual/passes/passes/test-virtual-passes.html', tests)
- self.assertNotIn('virtual/passes/test-virtual-virtual/passes.html', tests)
- self.assertNotIn('virtual/passes/virtual/passes/test-virtual-passes.html', tests)
-
</del><span class="cx"> def test_build_path(self):
</span><span class="cx"> port = self.make_port(options=optparse.Values({'build_directory': '/my-build-directory/'}))
</span><span class="cx"> if port.get_option('configuration') == 'Debug':
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -573,13 +573,6 @@
</span><span class="cx"> return self._driver.uri_to_test(uri)
</span><span class="cx">
</span><span class="cx"> def run_test(self, driver_input, stop_when_done):
</span><del>- base = self._port.lookup_virtual_test_base(driver_input.test_name)
- if base:
- virtual_driver_input = copy.copy(driver_input)
- virtual_driver_input.test_name = base
- virtual_driver_input.args = self._port.lookup_virtual_test_args(driver_input.test_name)
- return self.run_test(virtual_driver_input, stop_when_done)
-
</del><span class="cx"> pixel_tests_needed = driver_input.should_run_pixel_test
</span><span class="cx"> cmd_line_key = self._cmd_line_as_key(pixel_tests_needed, driver_input.args)
</span><span class="cx"> if cmd_line_key != self._driver_cmd_line:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporttestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/test.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/test.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/port/test.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> import time
</span><span class="cx">
</span><span class="cx"> from webkitpy.port import Port, Driver, DriverOutput
</span><del>-from webkitpy.port.base import VirtualTestSuite
</del><span class="cx"> from webkitpy.layout_tests.models.test_configuration import TestConfiguration
</span><span class="cx"> from webkitpy.common.system.filesystem_mock import MockFileSystem
</span><span class="cx"> from webkitpy.common.system.crashlogs import CrashLogs
</span><span class="lines">@@ -100,7 +99,7 @@
</span><span class="cx"> #
</span><span class="cx"> # These numbers may need to be updated whenever we add or delete tests.
</span><span class="cx"> #
</span><del>-TOTAL_TESTS = 107
</del><ins>+TOTAL_TESTS = 71
</ins><span class="cx"> TOTAL_SKIPS = 28
</span><span class="cx"> TOTAL_RETRIES = 14
</span><span class="cx">
</span><span class="lines">@@ -254,11 +253,6 @@
</span><span class="cx"> actual_image='image_not_in_pixeldir-pngtEXtchecksum\x00checksum_fail',
</span><span class="cx"> expected_image='image_not_in_pixeldir-pngtEXtchecksum\x00checksum-png')
</span><span class="cx">
</span><del>- # For testing that virtual test suites don't expand names containing themselves
- # See webkit.org/b/97925 and base_unittest.PortTest.test_tests().
- tests.add('passes/test-virtual-passes.html')
- tests.add('passes/passes/test-virtual-passes.html')
-
</del><span class="cx"> return tests
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -343,7 +337,6 @@
</span><span class="cx"> add_file(test, '-expected.txt', test.expected_text)
</span><span class="cx"> add_file(test, '-expected.png', test.expected_image)
</span><span class="cx">
</span><del>- filesystem.write_text_file(filesystem.join(LAYOUT_TEST_DIR, 'virtual', 'passes', 'args-expected.txt'), 'args-txt --virtual-arg')
</del><span class="cx"> # Clear the list of written files so that we can watch what happens during testing.
</span><span class="cx"> filesystem.clear_written_files()
</span><span class="cx">
</span><span class="lines">@@ -445,8 +438,7 @@
</span><span class="cx">
</span><span class="cx"> def _skipped_tests_for_unsupported_features(self, test_list):
</span><span class="cx"> return set(['failures/expected/skip_text.html',
</span><del>- 'failures/unexpected/skip_pass.html',
- 'virtual/skipped'])
</del><ins>+ 'failures/unexpected/skip_pass.html'])
</ins><span class="cx">
</span><span class="cx"> def name(self):
</span><span class="cx"> return self._name
</span><span class="lines">@@ -525,13 +517,6 @@
</span><span class="cx"> def all_baseline_variants(self):
</span><span class="cx"> return self.ALL_BASELINE_VARIANTS
</span><span class="cx">
</span><del>- def virtual_test_suites(self):
- return [
- VirtualTestSuite('virtual/passes', 'passes', ['--virtual-arg']),
- VirtualTestSuite('virtual/skipped', 'failures/expected', ['--virtual-arg2']),
- ]
-
-
</del><span class="cx"> class TestDriver(Driver):
</span><span class="cx"> """Test/Dummy implementation of the DumpRenderTree interface."""
</span><span class="cx"> next_pid = 1
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueriespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queries.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queries.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queries.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -539,8 +539,6 @@
</span><span class="cx"> help='display the baselines for *all* tests'),
</span><span class="cx"> make_option('--csv', action='store_true', default=False,
</span><span class="cx"> help='Print a CSV-style report that includes the port name, test_name, test platform, baseline type, baseline location, and baseline platform'),
</span><del>- make_option('--include-virtual-tests', action='store_true',
- help='Include virtual tests'),
</del><span class="cx"> ] + platform_options(use_globs=True)
</span><span class="cx"> Command.__init__(self, options=options)
</span><span class="cx"> self._platform_regexp = re.compile('platform/([^\/]+)/(.+)')
</span><span class="lines">@@ -558,11 +556,8 @@
</span><span class="cx"> else:
</span><span class="cx"> port_names = [default_port.name()]
</span><span class="cx">
</span><del>- if options.include_virtual_tests:
- tests = sorted(default_port.tests(args))
- else:
- # FIXME: make real_tests() a public method.
- tests = sorted(default_port._real_tests(args))
</del><ins>+ # FIXME: make real_tests() a public method.
+ tests = sorted(default_port._real_tests(args))
</ins><span class="cx">
</span><span class="cx"> for port_name in port_names:
</span><span class="cx"> if port_name != port_names[0]:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueries_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py (177033 => 177034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py 2014-12-09 20:31:41 UTC (rev 177033)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py 2014-12-09 20:50:16 UTC (rev 177034)
</span><span class="lines">@@ -262,7 +262,7 @@
</span><span class="cx"> command = PrintBaselines()
</span><span class="cx"> command.bind_to_tool(self.tool)
</span><span class="cx"> self.capture_output()
</span><del>- command.execute(MockOptions(all=False, include_virtual_tests=False, csv=False, platform=None), ['passes/text.html'], self.tool)
</del><ins>+ command.execute(MockOptions(all=False, csv=False, platform=None), ['passes/text.html'], self.tool)
</ins><span class="cx"> stdout, _, _ = self.restore_output()
</span><span class="cx"> self.assertMultiLineEqual(stdout,
</span><span class="cx"> ('// For test-win-xp\n'
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> command = PrintBaselines()
</span><span class="cx"> command.bind_to_tool(self.tool)
</span><span class="cx"> self.capture_output()
</span><del>- command.execute(MockOptions(all=False, include_virtual_tests=False, csv=False, platform='test-win-*'), ['passes/text.html'], self.tool)
</del><ins>+ command.execute(MockOptions(all=False, csv=False, platform='test-win-*'), ['passes/text.html'], self.tool)
</ins><span class="cx"> stdout, _, _ = self.restore_output()
</span><span class="cx"> self.assertMultiLineEqual(stdout,
</span><span class="cx"> ('// For test-win-vista\n'
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx"> command = PrintBaselines()
</span><span class="cx"> command.bind_to_tool(self.tool)
</span><span class="cx"> self.capture_output()
</span><del>- command.execute(MockOptions(all=False, platform='*xp', csv=True, include_virtual_tests=False), ['passes/text.html'], self.tool)
</del><ins>+ command.execute(MockOptions(all=False, platform='*xp', csv=True), ['passes/text.html'], self.tool)
</ins><span class="cx"> stdout, _, _ = self.restore_output()
</span><span class="cx"> self.assertMultiLineEqual(stdout,
</span><span class="cx"> ('test-win-xp,passes/text.html,None,png,passes/text-expected.png,None\n'
</span></span></pre>
</div>
</div>
</body>
</html>