<!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>[202362] 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/202362">202362</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 18:13:45 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix style issues in webkitpy
https://bugs.webkit.org/show_bug.cgi?id=159019
Reviewed by Daniel Bates.
Fixed the formatting issues as reported by check-webkit-style in webkitpy.
There is no functionality change.
Only affected file names retained below for brevity.
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
* Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py:
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
* Scripts/webkitpy/benchmark_runner/utils.py:
* Scripts/webkitpy/common/checkout/changelog.py:
* Scripts/webkitpy/common/checkout/changelog_unittest.py:
* Scripts/webkitpy/common/checkout/checkout.py:
* Scripts/webkitpy/common/checkout/checkout_mock.py:
* Scripts/webkitpy/common/checkout/checkout_unittest.py:
* Scripts/webkitpy/common/checkout/commitinfo.py:
* Scripts/webkitpy/common/checkout/commitinfo_unittest.py:
* Scripts/webkitpy/common/checkout/diff_parser_unittest.py:
* Scripts/webkitpy/common/checkout/scm/scm.py:
* Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
* Scripts/webkitpy/common/config/committers_unittest.py:
* Scripts/webkitpy/common/config/irc.py:
* Scripts/webkitpy/common/config/ports.py:
* Scripts/webkitpy/common/config/ports_unittest.py:
* Scripts/webkitpy/common/config/urls.py:
* Scripts/webkitpy/common/host_mock.py:
* Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
* Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py:
* Scripts/webkitpy/common/net/buildbot/buildbot.py:
* Scripts/webkitpy/common/net/buildbot/buildbot_mock.py:
* Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py:
* Scripts/webkitpy/common/net/credentials_unittest.py:
* Scripts/webkitpy/common/net/irc/ircproxy_unittest.py:
* Scripts/webkitpy/common/net/networktransaction_unittest.py:
* Scripts/webkitpy/common/net/statusserver.py:
* Scripts/webkitpy/common/system/autoinstall.py:
* Scripts/webkitpy/common/system/crashlogs_unittest.py:
* Scripts/webkitpy/common/system/executive.py:
* Scripts/webkitpy/common/system/executive_mock.py:
* Scripts/webkitpy/common/system/executive_unittest.py:
* Scripts/webkitpy/common/system/filesystem_mock.py:
* Scripts/webkitpy/common/system/filesystem_unittest.py:
* Scripts/webkitpy/common/system/logutils_unittest.py:
* Scripts/webkitpy/common/system/path.py:
* Scripts/webkitpy/common/system/path_unittest.py:
* Scripts/webkitpy/common/system/platforminfo.py:
* Scripts/webkitpy/common/system/user.py:
* Scripts/webkitpy/common/system/user_unittest.py:
* Scripts/webkitpy/common/system/workspace_unittest.py:
* Scripts/webkitpy/common/thread/threadedmessagequeue.py:
* Scripts/webkitpy/common/thread/threadedmessagequeue_unittest.py:
* Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
* Scripts/webkitpy/layout_tests/controllers/manager.py:
* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
* Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
* Scripts/webkitpy/layout_tests/lint_test_expectations_unittest.py:
* Scripts/webkitpy/layout_tests/models/test_configuration.py:
* Scripts/webkitpy/layout_tests/models/test_expectations.py:
* Scripts/webkitpy/layout_tests/models/test_failures.py:
* Scripts/webkitpy/layout_tests/models/test_run_results.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
* Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
* Scripts/webkitpy/layout_tests/views/printing.py:
* Scripts/webkitpy/performance_tests/perftestsrunner.py:
* Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
* Scripts/webkitpy/port/base_unittest.py:
* Scripts/webkitpy/port/driver.py:
* Scripts/webkitpy/port/driver_unittest.py:
* Scripts/webkitpy/port/factory.py:
* Scripts/webkitpy/port/gtk.py:
* Scripts/webkitpy/port/server_process_unittest.py:
* Scripts/webkitpy/port/test.py:
* Scripts/webkitpy/port/win.py:
* Scripts/webkitpy/style/checker.py:
* Scripts/webkitpy/style/checkers/common_unittest.py:
* Scripts/webkitpy/style/checkers/cpp.py:
* Scripts/webkitpy/style/checkers/cpp_unittest.py:
* Scripts/webkitpy/style/checkers/js.py:
* Scripts/webkitpy/style/checkers/jsonchecker.py:
* Scripts/webkitpy/style/checkers/png.py:
* Scripts/webkitpy/style/checkers/text.py:
* Scripts/webkitpy/style/checkers/text_unittest.py:
* Scripts/webkitpy/style/error_handlers.py:
* Scripts/webkitpy/style/filter.py:
* Scripts/webkitpy/style/filter_unittest.py:
* Scripts/webkitpy/style/optparser.py:
* Scripts/webkitpy/style/optparser_unittest.py:
* Scripts/webkitpy/test/main.py:
* Scripts/webkitpy/w3c/test_converter.py:
* Scripts/webkitpy/w3c/test_converter_unittest.py:
* Scripts/webkitpy/w3c/test_importer_unittest.py:
* Scripts/webkitpy/xcode/simulator.py:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driver_factorypy">trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_servertwisted_http_serverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driversimple_http_server_driverpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerutilspy">trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutchangelogpy">trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutchangelog_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcheckoutpy">trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcheckout_mockpy">trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcommitinfopy">trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutcommitinfo_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutdiff_parser_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmscmpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy">trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigcommitters_unittestpy">trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigircpy">trunk/Tools/Scripts/webkitpy/common/config/irc.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigportspy">trunk/Tools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigports_unittestpy">trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigurlspy">trunk/Tools/Scripts/webkitpy/common/config/urls.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonhost_mockpy">trunk/Tools/Scripts/webkitpy/common/host_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbugzillabugzillapy">trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbugzillabugzilla_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbuildbotbuildbotpy">trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbuildbotbuildbot_mockpy">trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbuildbotbuildbot_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetcredentials_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetircircproxy_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/irc/ircproxy_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetnetworktransaction_unittestpy">trunk/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetstatusserverpy">trunk/Tools/Scripts/webkitpy/common/net/statusserver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemautoinstallpy">trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemcrashlogs_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemexecutivepy">trunk/Tools/Scripts/webkitpy/common/system/executive.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemexecutive_mockpy">trunk/Tools/Scripts/webkitpy/common/system/executive_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemexecutive_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystem_mockpy">trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemfilesystem_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemlogutils_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/logutils_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystempathpy">trunk/Tools/Scripts/webkitpy/common/system/path.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystempath_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfopy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemuserpy">trunk/Tools/Scripts/webkitpy/common/system/user.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemuser_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/user_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemworkspace_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonthreadthreadedmessagequeuepy">trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonthreadthreadedmessagequeue_unittestpy">trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue_unittest.py</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_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerstest_result_writerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testslayout_packagejson_results_generatorpy">trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testslint_test_expectations_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_configurationpy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.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_failurespy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.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="#trunkToolsScriptswebkitpylayout_testsrun_webkit_tests_integrationtestpy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsmetered_stream_unittestpy">trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsprintingpy">trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyperformance_testsperftestsrunnerpy">trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyperformance_testsperftestsrunner_integrationtestpy">trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.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="#trunkToolsScriptswebkitpyportdriver_unittestpy">trunk/Tools/Scripts/webkitpy/port/driver_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportfactorypy">trunk/Tools/Scripts/webkitpy/port/factory.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportgtkpy">trunk/Tools/Scripts/webkitpy/port/gtk.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportserver_process_unittestpy">trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyporttestpy">trunk/Tools/Scripts/webkitpy/port/test.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportwinpy">trunk/Tools/Scripts/webkitpy/port/win.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerpy">trunk/Tools/Scripts/webkitpy/style/checker.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscommon_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/common_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpppy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerscpp_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckersjspy">trunk/Tools/Scripts/webkitpy/style/checkers/js.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckersjsoncheckerpy">trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerspngpy">trunk/Tools/Scripts/webkitpy/style/checkers/png.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerstextpy">trunk/Tools/Scripts/webkitpy/style/checkers/text.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylecheckerstext_unittestpy">trunk/Tools/Scripts/webkitpy/style/checkers/text_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystyleerror_handlerspy">trunk/Tools/Scripts/webkitpy/style/error_handlers.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylefilterpy">trunk/Tools/Scripts/webkitpy/style/filter.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystylefilter_unittestpy">trunk/Tools/Scripts/webkitpy/style/filter_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystyleoptparserpy">trunk/Tools/Scripts/webkitpy/style/optparser.py</a></li>
<li><a href="#trunkToolsScriptswebkitpystyleoptparser_unittestpy">trunk/Tools/Scripts/webkitpy/style/optparser_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytestmainpy">trunk/Tools/Scripts/webkitpy/test/main.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_converterpy">trunk/Tools/Scripts/webkitpy/w3c/test_converter.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_converter_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_importer_unittestpy">trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyxcodesimulatorpy">trunk/Tools/Scripts/webkitpy/xcode/simulator.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/ChangeLog 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -1,3 +1,102 @@
</span><ins>+2016-06-22 Aakash Jain <aakash_jain@apple.com>
+
+ Fix style issues in webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=159019
+
+ Reviewed by Daniel Bates.
+
+ Fixed the formatting issues as reported by check-webkit-style in webkitpy.
+ There is no functionality change.
+ Only affected file names retained below for brevity.
+
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py:
+ * Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py:
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+ * Scripts/webkitpy/benchmark_runner/utils.py:
+ * Scripts/webkitpy/common/checkout/changelog.py:
+ * Scripts/webkitpy/common/checkout/changelog_unittest.py:
+ * Scripts/webkitpy/common/checkout/checkout.py:
+ * Scripts/webkitpy/common/checkout/checkout_mock.py:
+ * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+ * Scripts/webkitpy/common/checkout/commitinfo.py:
+ * Scripts/webkitpy/common/checkout/commitinfo_unittest.py:
+ * Scripts/webkitpy/common/checkout/diff_parser_unittest.py:
+ * Scripts/webkitpy/common/checkout/scm/scm.py:
+ * Scripts/webkitpy/common/checkout/scm/scm_unittest.py:
+ * Scripts/webkitpy/common/config/committers_unittest.py:
+ * Scripts/webkitpy/common/config/irc.py:
+ * Scripts/webkitpy/common/config/ports.py:
+ * Scripts/webkitpy/common/config/ports_unittest.py:
+ * Scripts/webkitpy/common/config/urls.py:
+ * Scripts/webkitpy/common/host_mock.py:
+ * Scripts/webkitpy/common/net/bugzilla/bugzilla.py:
+ * Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py:
+ * Scripts/webkitpy/common/net/buildbot/buildbot.py:
+ * Scripts/webkitpy/common/net/buildbot/buildbot_mock.py:
+ * Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py:
+ * Scripts/webkitpy/common/net/credentials_unittest.py:
+ * Scripts/webkitpy/common/net/irc/ircproxy_unittest.py:
+ * Scripts/webkitpy/common/net/networktransaction_unittest.py:
+ * Scripts/webkitpy/common/net/statusserver.py:
+ * Scripts/webkitpy/common/system/autoinstall.py:
+ * Scripts/webkitpy/common/system/crashlogs_unittest.py:
+ * Scripts/webkitpy/common/system/executive.py:
+ * Scripts/webkitpy/common/system/executive_mock.py:
+ * Scripts/webkitpy/common/system/executive_unittest.py:
+ * Scripts/webkitpy/common/system/filesystem_mock.py:
+ * Scripts/webkitpy/common/system/filesystem_unittest.py:
+ * Scripts/webkitpy/common/system/logutils_unittest.py:
+ * Scripts/webkitpy/common/system/path.py:
+ * Scripts/webkitpy/common/system/path_unittest.py:
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ * Scripts/webkitpy/common/system/user.py:
+ * Scripts/webkitpy/common/system/user_unittest.py:
+ * Scripts/webkitpy/common/system/workspace_unittest.py:
+ * Scripts/webkitpy/common/thread/threadedmessagequeue.py:
+ * Scripts/webkitpy/common/thread/threadedmessagequeue_unittest.py:
+ * Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
+ * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+ * Scripts/webkitpy/layout_tests/lint_test_expectations_unittest.py:
+ * Scripts/webkitpy/layout_tests/models/test_configuration.py:
+ * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+ * Scripts/webkitpy/layout_tests/models/test_failures.py:
+ * Scripts/webkitpy/layout_tests/models/test_run_results.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ * Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+ * Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
+ * Scripts/webkitpy/port/base_unittest.py:
+ * Scripts/webkitpy/port/driver.py:
+ * Scripts/webkitpy/port/driver_unittest.py:
+ * Scripts/webkitpy/port/factory.py:
+ * Scripts/webkitpy/port/gtk.py:
+ * Scripts/webkitpy/port/server_process_unittest.py:
+ * Scripts/webkitpy/port/test.py:
+ * Scripts/webkitpy/port/win.py:
+ * Scripts/webkitpy/style/checker.py:
+ * Scripts/webkitpy/style/checkers/common_unittest.py:
+ * Scripts/webkitpy/style/checkers/cpp.py:
+ * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+ * Scripts/webkitpy/style/checkers/js.py:
+ * Scripts/webkitpy/style/checkers/jsonchecker.py:
+ * Scripts/webkitpy/style/checkers/png.py:
+ * Scripts/webkitpy/style/checkers/text.py:
+ * Scripts/webkitpy/style/checkers/text_unittest.py:
+ * Scripts/webkitpy/style/error_handlers.py:
+ * Scripts/webkitpy/style/filter.py:
+ * Scripts/webkitpy/style/filter_unittest.py:
+ * Scripts/webkitpy/style/optparser.py:
+ * Scripts/webkitpy/style/optparser_unittest.py:
+ * Scripts/webkitpy/test/main.py:
+ * Scripts/webkitpy/w3c/test_converter.py:
+ * Scripts/webkitpy/w3c/test_converter_unittest.py:
+ * Scripts/webkitpy/w3c/test_importer_unittest.py:
+ * Scripts/webkitpy/xcode/simulator.py:
+
</ins><span class="cx"> 2016-06-22 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> DatabaseProcess doesn't handle WebProcesses going away uncleanly.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx">
</span><span class="cx"> from abc import ABCMeta, abstractmethod
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class BrowserDriver(object):
</span><span class="cx"> platform = None
</span><span class="cx"> browser_name = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbrowser_driverbrowser_driver_factorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/browser_driver_factory.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -11,7 +11,6 @@
</span><span class="cx"> platforms = set()
</span><span class="cx"> browsers = set()
</span><span class="cx">
</span><del>-
</del><span class="cx"> @classmethod
</span><span class="cx"> def available_platforms(cls):
</span><span class="cx"> return list(cls.platforms)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driverhttp_servertwisted_http_serverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -17,6 +17,7 @@
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ServerControl(Resource):
</span><span class="cx"> isLeaf = True
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerhttp_server_driversimple_http_server_driverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> _log.info('HTTP Server is serving at port: %d', self._server_port)
</span><span class="cx"> break
</span><span class="cx"> except Exception as error:
</span><del>- _log.info('Error: %s' % error)
</del><ins>+ _log.info('Error: %s' % error)
</ins><span class="cx"> _log.info('Server port is not found this time, retry after %f seconds' % interval)
</span><span class="cx"> time.sleep(interval)
</span><span class="cx"> interval *= 2
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerutilspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> _log.info("Error removing %s: %s" % (path, error))
</span><span class="cx"> pass
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # Borrow this code from
</span><span class="cx"> # 'http://stackoverflow.com/questions/2281850/timeout-function-if-it-takes-too-long-to-finish'
</span><span class="cx"> class TimeoutError(Exception):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutchangelogpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -294,6 +294,7 @@
</span><span class="cx"> return False
</span><span class="cx"> return True
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # FIXME: Various methods on ChangeLog should move into ChangeLogEntry instead.
</span><span class="cx"> class ChangeLog(object):
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutchangelog_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/changelog_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -681,7 +681,6 @@
</span><span class="cx"> expected_contents = "== Rolled over to ChangeLog-2009-06-16 ==\n"
</span><span class="cx"> self.assertEqual(actual_contents.splitlines(), expected_contents.splitlines())
</span><span class="cx">
</span><del>-
</del><span class="cx"> def test_prepend_text(self):
</span><span class="cx"> fs = MockFileSystem()
</span><span class="cx"> fs.write_text_file(self._changelog_path, self._example_changelog)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcheckoutpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> try:
</span><span class="cx"> return parse_bug_id_from_changelog(self.commit_message_for_this_commit(git_commit, changed_files).message())
</span><span class="cx"> except ScriptError, e:
</span><del>- pass # We might not have ChangeLogs.
</del><ins>+ pass # We might not have ChangeLogs.
</ins><span class="cx">
</span><span class="cx"> def apply_patch(self, patch):
</span><span class="cx"> # It's possible that the patch was not made from the root directory.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcheckout_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_mock.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> })
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MockCheckout(object):
</span><span class="cx"> def __init__(self):
</span><span class="cx"> # FIXME: It's unclear if a MockCheckout is very useful. A normal Checkout
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcheckout_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -330,6 +330,7 @@
</span><span class="cx"> commit_message.message_lines = commit_message.message_lines[1:]
</span><span class="cx"> self.assertMultiLineEqual(commit_message.message(), expected_commit_message)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CheckoutTest(unittest.TestCase):
</span><span class="cx"> def _make_checkout(self):
</span><span class="cx"> return Checkout(scm=MockSCM(), filesystem=MockFileSystem(), executive=MockExecutive())
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcommitinfopy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> self.author(),
</span><span class="cx"> self.reviewer(),
</span><span class="cx"> ]
</span><del>- return set([party for party in responsible_parties if party]) # Filter out None
</del><ins>+ return set([party for party in responsible_parties if party]) # Filter out None
</ins><span class="cx">
</span><span class="cx"> # FIXME: It is slightly lame that this "view" method is on this "model" class (in MVC terms)
</span><span class="cx"> def blame_string(self, bugs):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutcommitinfo_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/commitinfo_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> from webkitpy.common.checkout.commitinfo import CommitInfo
</span><span class="cx"> from webkitpy.common.config.committers import CommitterList, Committer, Reviewer
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CommitInfoTest(unittest.TestCase):
</span><span class="cx">
</span><span class="cx"> def test_commit_info_creation(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutdiff_parser_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/diff_parser_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -33,10 +33,11 @@
</span><span class="cx">
</span><span class="cx"> from webkitpy.common.checkout.diff_test_data import DIFF_TEST_DATA
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class DiffParserTest(unittest.TestCase):
</span><span class="cx"> maxDiff = None
</span><span class="cx">
</span><del>- def test_diff_parser(self, parser = None):
</del><ins>+ def test_diff_parser(self, parser=None):
</ins><span class="cx"> if not parser:
</span><span class="cx"> parser = diff_parser.DiffParser(DIFF_TEST_DATA.splitlines())
</span><span class="cx"> self.assertEqual(3, len(parser.files))
</span><span class="lines">@@ -118,11 +119,11 @@
</span><span class="cx"> p = re.compile(r' ([a|b])/')
</span><span class="cx">
</span><span class="cx"> prefixes = [
</span><del>- { 'a' : 'i', 'b' : 'w' }, # git-diff (compares the (i)ndex and the (w)ork tree)
- { 'a' : 'c', 'b' : 'w' }, # git-diff HEAD (compares a (c)ommit and the (w)ork tree)
- { 'a' : 'c', 'b' : 'i' }, # git diff --cached (compares a (c)ommit and the (i)ndex)
- { 'a' : 'o', 'b' : 'w' }, # git-diff HEAD:file1 file2 (compares an (o)bject and a (w)ork tree entity)
- { 'a' : '1', 'b' : '2' }, # git diff --no-index a b (compares two non-git things (1) and (2))
</del><ins>+ {'a': 'i', 'b': 'w'}, # git-diff (compares the (i)ndex and the (w)ork tree)
+ {'a': 'c', 'b': 'w'}, # git-diff HEAD (compares a (c)ommit and the (w)ork tree)
+ {'a': 'c', 'b': 'i'}, # git diff --cached (compares a (c)ommit and the (i)ndex)
+ {'a': 'o', 'b': 'w'}, # git-diff HEAD:file1 file2 (compares an (o)bject and a (w)ork tree entity)
+ {'a': '1', 'b': '2'}, # git diff --no-index a b (compares two non-git things (1) and (2))
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> for prefix in prefixes:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscmpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> self.prompt_for_password = prompt_for_password
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> # SCM methods are expected to return paths relative to self.checkout_root.
</span><span class="cx"> class SCM:
</span><span class="cx"> def __init__(self, cwd, executive=None, filesystem=None):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommoncheckoutscmscm_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/scm_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> from datetime import date
</span><span class="cx"> from webkitpy.common.checkout.checkout import Checkout
</span><span class="cx"> from webkitpy.common.config.committers import Committer # FIXME: This should not be needed
</span><del>-from webkitpy.common.net.bugzilla import Attachment # FIXME: This should not be needed
</del><ins>+from webkitpy.common.net.bugzilla import Attachment # FIXME: This should not be needed
</ins><span class="cx"> from webkitpy.common.system.executive import Executive, ScriptError
</span><span class="cx"> from webkitpy.common.system.filesystem_mock import MockFileSystem
</span><span class="cx"> from webkitpy.common.system.outputcapture import OutputCapture
</span><span class="lines">@@ -79,6 +79,7 @@
</span><span class="cx"> # Eventually we will want to write tests which work for both scms. (like update_webkit, changed_files, etc.)
</span><span class="cx"> # Perhaps through some SCMTest base-class which both SVNTest and GitTest inherit from.
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def run_command(*args, **kwargs):
</span><span class="cx"> # FIXME: This should not be a global static.
</span><span class="cx"> # New code should use Executive.run_command directly instead
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> def run_silent(args, cwd=None):
</span><span class="cx"> # Note: Not thread safe: http://bugs.python.org/issue2320
</span><span class="cx"> process = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=cwd)
</span><del>- process.communicate() # ignore output
</del><ins>+ process.communicate() # ignore output
</ins><span class="cx"> exit_code = process.wait()
</span><span class="cx"> if exit_code:
</span><span class="cx"> raise ScriptError('Failed to run "%s" exit_code: %d cwd: %s' % (args, exit_code, cwd))
</span><span class="lines">@@ -234,7 +235,7 @@
</span><span class="cx"> # For testing the SCM baseclass directly.
</span><span class="cx"> class SCMClassTests(unittest.TestCase):
</span><span class="cx"> def setUp(self):
</span><del>- self.dev_null = open(os.devnull, "w") # Used to make our Popen calls quiet.
</del><ins>+ self.dev_null = open(os.devnull, "w") # Used to make our Popen calls quiet.
</ins><span class="cx">
</span><span class="cx"> def tearDown(self):
</span><span class="cx"> self.dev_null.close()
</span><span class="lines">@@ -253,12 +254,12 @@
</span><span class="cx"> self.assertRaises(ScriptError, run_command, ['grep', 'bar'], input=input_process.stdout)
</span><span class="cx">
</span><span class="cx"> # Test when the run_command process fails.
</span><del>- input_process = subprocess.Popen(['echo', 'foo\nbar'], stdout=subprocess.PIPE, stderr=self.dev_null) # grep shows usage and calls exit(2) when called w/o arguments.
</del><ins>+ input_process = subprocess.Popen(['echo', 'foo\nbar'], stdout=subprocess.PIPE, stderr=self.dev_null) # grep shows usage and calls exit(2) when called w/o arguments.
</ins><span class="cx"> self.assertRaises(ScriptError, run_command, command_returns_non_zero, input=input_process.stdout)
</span><span class="cx">
</span><span class="cx"> def test_error_handlers(self):
</span><del>- git_failure_message="Merge conflict during commit: Your file or directory 'WebCore/ChangeLog' is probably out-of-date: resource out of date; try updating at /usr/local/libexec/git-core//git-svn line 469"
- svn_failure_message="""svn: Commit failed (details follow):
</del><ins>+ git_failure_message = "Merge conflict during commit: Your file or directory 'WebCore/ChangeLog' is probably out-of-date: resource out of date; try updating at /usr/local/libexec/git-core//git-svn line 469"
+ svn_failure_message = """svn: Commit failed (details follow):
</ins><span class="cx"> svn: File or directory 'ChangeLog' is out of date; try updating
</span><span class="cx"> svn: resource out of date; try updating
</span><span class="cx"> """
</span><span class="lines">@@ -696,7 +697,7 @@
</span><span class="cx"> scripts_path = os.path.join(self.svn_checkout_path, 'Tools', 'Scripts')
</span><span class="cx"> os.makedirs(scripts_path)
</span><span class="cx"> create_patch_path = os.path.join(scripts_path, 'svn-create-patch')
</span><del>- write_into_file_at_path(create_patch_path, '#!/bin/sh\necho $PWD') # We could pass -n to prevent the \n, but not all echo accept -n.
</del><ins>+ write_into_file_at_path(create_patch_path, '#!/bin/sh\necho $PWD') # We could pass -n to prevent the \n, but not all echo accept -n.
</ins><span class="cx"> os.chmod(create_patch_path, stat.S_IXUSR | stat.S_IRUSR)
</span><span class="cx">
</span><span class="cx"> # Change into our test directory and run the create_patch command.
</span><span class="lines">@@ -705,7 +706,7 @@
</span><span class="cx"> self.assertEqual(scm.checkout_root, self.svn_checkout_path) # Sanity check that detection worked right.
</span><span class="cx"> patch_contents = scm.create_patch()
</span><span class="cx"> # Our fake 'svn-create-patch' returns $PWD instead of a patch, check that it was executed from the root of the repo.
</span><del>- self.assertEqual("%s\n" % os.path.realpath(scm.checkout_root), patch_contents) # Add a \n because echo adds a \n.
</del><ins>+ self.assertEqual("%s\n" % os.path.realpath(scm.checkout_root), patch_contents) # Add a \n because echo adds a \n.
</ins><span class="cx">
</span><span class="cx"> def test_detection(self):
</span><span class="cx"> self.assertEqual(self.scm.display_name(), "svn")
</span><span class="lines">@@ -957,6 +958,7 @@
</span><span class="cx"> def test_exists(self):
</span><span class="cx"> self._shared_test_exists(self.scm, self.scm.commit_with_message)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class GitTest(SCMTest):
</span><span class="cx">
</span><span class="cx"> def setUp(self):
</span><span class="lines">@@ -1173,7 +1175,7 @@
</span><span class="cx"> run_command(['git', 'commit', '-a', '-m', 'commit to be thrown away by rebase abort'])
</span><span class="cx">
</span><span class="cx"> # --quiet doesn't make git svn silent, so use run_silent to redirect output
</span><del>- self.assertRaises(ScriptError, run_silent, ['git', 'svn', '--quiet', 'rebase']) # Will fail due to a conflict leaving us mid-rebase.
</del><ins>+ self.assertRaises(ScriptError, run_silent, ['git', 'svn', '--quiet', 'rebase']) # Will fail due to a conflict leaving us mid-rebase.
</ins><span class="cx">
</span><span class="cx"> self.assertTrue(self.scm.rebase_in_progress())
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigcommitters_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> import unittest
</span><span class="cx"> from webkitpy.common.config.committers import CommitterList, Contributor, Committer, Reviewer
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CommittersTest(unittest.TestCase):
</span><span class="cx"> def test_committer_lookup(self):
</span><span class="cx"> committer = Committer('Test One', 'one@test.com', 'one')
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigircpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/irc.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/irc.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/config/irc.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -26,6 +26,6 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-server="irc.freenode.net"
-port=6665
-channel="#webkit"
</del><ins>+server = "irc.freenode.net"
+port = 6665
+channel = "#webkit"
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -146,6 +146,7 @@
</span><span class="cx"> command.append("--ios-simulator")
</span><span class="cx"> return command
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MacPort(DeprecatedPort):
</span><span class="cx"> port_flag_name = "mac"
</span><span class="cx">
</span><span class="lines">@@ -154,6 +155,7 @@
</span><span class="cx"> command.append("--dump-render-tree")
</span><span class="cx"> return command
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MacWK2Port(DeprecatedPort):
</span><span class="cx"> port_flag_name = "mac-wk2"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigports_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="cx"> # met:
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # * Redistributions of source code must retain the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer.
</span><span class="cx"> # * Redistributions in binary form must reproduce the above
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> # * Neither the name of Google Inc. nor the names of its
</span><span class="cx"> # contributors may be used to endorse or promote products derived from
</span><span class="cx"> # this software without specific prior written permission.
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
</span><span class="cx"> # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
</span><span class="cx"> # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigurlspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/urls.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/urls.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/config/urls.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -56,6 +56,7 @@
</span><span class="cx">
</span><span class="cx"> statusserver_default_host = "webkit-queues.webkit.org"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def parse_bug_id(string):
</span><span class="cx"> if not string:
</span><span class="cx"> return None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonhost_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/host_mock.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/host_mock.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/host_mock.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -74,4 +74,3 @@
</span><span class="cx">
</span><span class="cx"> def watch_list(self):
</span><span class="cx"> return self._watch_list
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbugzillabugzillapy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx"> import socket
</span><span class="cx"> import urllib
</span><span class="cx">
</span><del>-from datetime import datetime # used in timestamp()
</del><ins>+from datetime import datetime # used in timestamp()
</ins><span class="cx">
</span><span class="cx"> from .attachment import Attachment
</span><span class="cx"> from .bug import Bug
</span><span class="lines">@@ -291,6 +291,7 @@
</span><span class="cx"> results_page = self._load_query(review_queue_url)
</span><span class="cx"> return bool(re.search("did not match anything", results_page.read()))
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CommitQueueFlag(object):
</span><span class="cx"> mark_for_nothing = 0
</span><span class="cx"> mark_for_commit_queue = 1
</span><span class="lines">@@ -515,7 +516,7 @@
</span><span class="cx"> for attachment in attachments:
</span><span class="cx"> if attachment.id() == int(attachment_id):
</span><span class="cx"> return attachment
</span><del>- return None # This should never be hit.
</del><ins>+ return None # This should never be hit.
</ins><span class="cx">
</span><span class="cx"> def authenticate(self):
</span><span class="cx"> if self.authenticated:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbugzillabugzilla_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -68,18 +68,18 @@
</span><span class="cx"> '''
</span><span class="cx"> _expected_example_attachment_parsing = {
</span><span class="cx"> 'attach_date': datetime.datetime(2009, 07, 29, 10, 23),
</span><del>- 'bug_id' : 100,
- 'is_obsolete' : True,
- 'is_patch' : True,
- 'id' : 33721,
- 'url' : "https://bugs.webkit.org/attachment.cgi?id=33721",
- 'name' : "Fixed whitespace issue",
- 'type' : "text/plain",
- 'review' : '+',
- 'reviewer_email' : 'one@test.com',
- 'commit-queue' : '+',
- 'committer_email' : 'two@test.com',
- 'attacher_email' : 'christian.plesner.hansen@gmail.com',
</del><ins>+ 'bug_id': 100,
+ 'is_obsolete': True,
+ 'is_patch': True,
+ 'id': 33721,
+ 'url': "https://bugs.webkit.org/attachment.cgi?id=33721",
+ 'name': "Fixed whitespace issue",
+ 'type': "text/plain",
+ 'review': '+',
+ 'reviewer_email': 'one@test.com',
+ 'commit-queue': '+',
+ 'committer_email': 'two@test.com',
+ 'attacher_email': 'christian.plesner.hansen@gmail.com',
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> def test_url_creation(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbuildbotbuildbotpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> self._revision_to_build_number = None
</span><span class="cx"> from webkitpy.thirdparty.autoinstalled.mechanize import Browser
</span><span class="cx"> self._browser = Browser()
</span><del>- self._browser.set_handle_robots(False) # The builder pages are excluded by robots.txt
</del><ins>+ self._browser.set_handle_robots(False) # The builder pages are excluded by robots.txt
</ins><span class="cx">
</span><span class="cx"> def name(self):
</span><span class="cx"> return self._name
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx">
</span><span class="cx"> def _parse_current_build_cell(self, builder, cell):
</span><span class="cx"> activity_lines = cell.renderContents().split("<br />")
</span><del>- builder["activity"] = activity_lines[0] # normally "building" or "idle"
</del><ins>+ builder["activity"] = activity_lines[0] # normally "building" or "idle"
</ins><span class="cx"> # The middle lines document how long left for any current builds.
</span><span class="cx"> match = re.match("(?P<pending_builds>\d) pending", activity_lines[-1])
</span><span class="cx"> builder["pending_builds"] = int(match.group("pending_builds")) if match else 0
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbuildbotbuildbot_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_mock.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_mock.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_mock.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> self._revision = revision
</span><span class="cx"> self._is_green = is_green
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MockBuilder(object):
</span><span class="cx"> def __init__(self, name):
</span><span class="cx"> self._name = name
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbuildbotbuildbot_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> )
</span><span class="cx"> results = [self._mock_test_result(testname) for testname in failure(build_number)]
</span><span class="cx"> layout_test_results = LayoutTestResults(test_results=results, did_exceed_test_failure_limit=False)
</span><ins>+
</ins><span class="cx"> def mock_layout_test_results():
</span><span class="cx"> return layout_test_results
</span><span class="cx"> build.layout_test_results = mock_layout_test_results
</span><span class="lines">@@ -118,8 +119,8 @@
</span><span class="cx">
</span><span class="cx"> def test_build_and_revision_for_filename(self):
</span><span class="cx"> expectations = {
</span><del>- "r47483 (1)/" : (47483, 1),
- "r47483 (1).zip" : (47483, 1),
</del><ins>+ "r47483 (1)/": (47483, 1),
+ "r47483 (1).zip": (47483, 1),
</ins><span class="cx"> "random junk": None,
</span><span class="cx"> }
</span><span class="cx"> for filename, revision_and_build in expectations.items():
</span><span class="lines">@@ -186,7 +187,7 @@
</span><span class="cx"> _expected_example_one_box_parsings = [
</span><span class="cx"> {
</span><span class="cx"> 'is_green': True,
</span><del>- 'build_number' : 3693,
</del><ins>+ 'build_number': 3693,
</ins><span class="cx"> 'name': u'Windows Debug (Tests)',
</span><span class="cx"> 'built_revision': 47380,
</span><span class="cx"> 'activity': 'building',
</span><span class="lines">@@ -194,7 +195,7 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> 'is_green': False,
</span><del>- 'build_number' : None,
</del><ins>+ 'build_number': None,
</ins><span class="cx"> 'name': u'SnowLeopard Intel Release',
</span><span class="cx"> 'built_revision': None,
</span><span class="cx"> 'activity': 'building',
</span><span class="lines">@@ -202,7 +203,7 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> 'is_green': False,
</span><del>- 'build_number' : 654,
</del><ins>+ 'build_number': 654,
</ins><span class="cx"> 'name': u'Qt Linux Release',
</span><span class="cx"> 'built_revision': 47383,
</span><span class="cx"> 'activity': 'idle',
</span><span class="lines">@@ -210,7 +211,7 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> 'is_green': True,
</span><del>- 'build_number' : 2090,
</del><ins>+ 'build_number': 2090,
</ins><span class="cx"> 'name': u'Qt Windows 32-bit Debug',
</span><span class="cx"> 'built_revision': 60563,
</span><span class="cx"> 'activity': 'building',
</span><span class="lines">@@ -250,10 +251,10 @@
</span><span class="cx"> def mock_fetch_build_dictionary(self, build_number):
</span><span class="cx"> build_dictionary = {
</span><span class="cx"> "sourceStamp": {
</span><del>- "revision" : 2 * build_number,
</del><ins>+ "revision": 2 * build_number,
</ins><span class="cx"> },
</span><del>- "number" : int(build_number),
- "results" : build_number % 2, # 0 means pass
</del><ins>+ "number": int(build_number),
+ "results": build_number % 2, # 0 means pass
</ins><span class="cx"> }
</span><span class="cx"> return build_dictionary
</span><span class="cx"> buildbot._fetch_build_dictionary = mock_fetch_build_dictionary
</span><span class="lines">@@ -299,16 +300,16 @@
</span><span class="cx"> '''
</span><span class="cx"> _expected_files = [
</span><span class="cx"> {
</span><del>- "filename" : "r47483 (1)/",
- "size" : "",
- "type" : "[Directory]",
- "encoding" : "",
</del><ins>+ "filename": "r47483 (1)/",
+ "size": "",
+ "type": "[Directory]",
+ "encoding": "",
</ins><span class="cx"> },
</span><span class="cx"> {
</span><del>- "filename" : "r47484 (2).zip",
- "size" : "89K",
- "type" : "[application/zip]",
- "encoding" : "",
</del><ins>+ "filename": "r47484 (2).zip",
+ "size": "89K",
+ "type": "[application/zip]",
+ "encoding": "",
</ins><span class="cx"> },
</span><span class="cx"> ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetcredentials_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/credentials_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> # FIXME: This test won't work if the user has a credential for foo.example.com!
</span><span class="cx"> credentials = Credentials("foo.example.com")
</span><span class="cx"> if not credentials._is_mac_os_x():
</span><del>- return # This test does not run on a non-Mac.
</del><ins>+ return # This test does not run on a non-Mac.
</ins><span class="cx">
</span><span class="cx"> # Note, we ignore the captured output because it is already covered
</span><span class="cx"> # by the test case CredentialsTest._assert_security_call (below).
</span><span class="lines">@@ -158,7 +158,6 @@
</span><span class="cx"> # credential source could be affected by the user's environment.
</span><span class="cx"> self.assertEqual(credentials.read_credentials(), ("test@webkit.org", "SECRETSAUCE"))
</span><span class="cx">
</span><del>-
</del><span class="cx"> def test_keyring_without_git_repo(self):
</span><span class="cx"> # FIXME: This should share more code with test_read_credentials_without_git_repo
</span><span class="cx"> class MockKeyring(object):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetircircproxy_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/irc/ircproxy_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/irc/ircproxy_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/irc/ircproxy_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="cx"> # met:
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # * Redistributions of source code must retain the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer.
</span><span class="cx"> # * Redistributions in binary form must reproduce the above
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> # * Neither the name of Google Inc. nor the names of its
</span><span class="cx"> # contributors may be used to endorse or promote products derived from
</span><span class="cx"> # this software without specific prior written permission.
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
</span><span class="cx"> # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
</span><span class="cx"> # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> from webkitpy.common.system.outputcapture import OutputCapture
</span><span class="cx"> from webkitpy.thirdparty.mock import Mock
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class IRCProxyTest(unittest.TestCase):
</span><span class="cx"> def test_trivial(self):
</span><span class="cx"> def fun():
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetnetworktransaction_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/networktransaction_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="cx"> # met:
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # * Redistributions of source code must retain the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer.
</span><span class="cx"> # * Redistributions in binary form must reproduce the above
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> # * Neither the name of Google Inc. nor the names of its
</span><span class="cx"> # contributors may be used to endorse or promote products derived from
</span><span class="cx"> # this software without specific prior written permission.
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
</span><span class="cx"> # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
</span><span class="cx"> # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx"> def test_timeout(self):
</span><span class="cx"> self._run_count = 0
</span><del>- transaction = NetworkTransaction(initial_backoff_seconds=60*60, timeout_seconds=60)
</del><ins>+ transaction = NetworkTransaction(initial_backoff_seconds=60 * 60, timeout_seconds=60)
</ins><span class="cx"> did_process_exception = False
</span><span class="cx"> did_throw_exception = True
</span><span class="cx"> try:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetstatusserverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/statusserver.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/statusserver.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/net/statusserver.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> # Copyright (C) 2009 Google Inc. All rights reserved.
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="cx"> # met:
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # * Redistributions of source code must retain the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer.
</span><span class="cx"> # * Redistributions in binary form must reproduce the above
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> # * Neither the name of Google Inc. nor the names of its
</span><span class="cx"> # contributors may be used to endorse or promote products derived from
</span><span class="cx"> # this software without specific prior written permission.
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
</span><span class="cx"> # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
</span><span class="cx"> # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemautoinstallpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/autoinstall.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> _SOURCEFORGE_ENV_VAR = 'SOURCEFORGE_MIRRORS'
</span><span class="cx"> _CACHE_ENV_VAR = 'LOCAL_AUTOINSTALL_CACHE'
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AutoInstaller(object):
</span><span class="cx">
</span><span class="cx"> """Supports automatically installing Python packages from an URL.
</span><span class="lines">@@ -382,7 +383,7 @@
</span><span class="cx"> if not 200 <= code < 300:
</span><span class="cx"> raise ValueError("HTTP Error code %s" % code)
</span><span class="cx">
</span><del>- BUFSIZE = 2**13 # 8KB
</del><ins>+ BUFSIZE = 2 ** 13 # 8KB
</ins><span class="cx"> while True:
</span><span class="cx"> data = netstream.read(BUFSIZE)
</span><span class="cx"> if not data:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemcrashlogs_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> # Needed to support Windows port tests
</span><span class="cx"> from webkitpy.port.win import WinPort
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def make_mock_crash_report_darwin(process_name, pid):
</span><span class="cx"> return """Process: {process_name} [{pid}]
</span><span class="cx"> Path: /Volumes/Data/slave/snowleopard-intel-release-tests/build/WebKitBuild/Release/{process_name}
</span><span class="lines">@@ -232,6 +233,7 @@
</span><span class="cx"> quit:
</span><span class="cx"> """.format(process_name=process_name, pid=pid)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CrashLogsTest(unittest.TestCase):
</span><span class="cx"> def create_crash_logs_darwin(self):
</span><span class="cx"> if not SystemHost().platform.is_mac():
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemexecutivepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/executive.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/executive.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> message += " cwd: %s" % cwd
</span><span class="cx">
</span><span class="cx"> Exception.__init__(self, message)
</span><del>- self.script_args = script_args # 'args' is already used by Exception
</del><ins>+ self.script_args = script_args # 'args' is already used by Exception
</ins><span class="cx"> self.exit_code = exit_code
</span><span class="cx"> self.output = output
</span><span class="cx"> self.cwd = cwd
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemexecutive_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/executive_mock.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/executive_mock.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive_mock.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> def communicate(self, input=None):
</span><span class="cx"> return (self.stdout, self.stderr)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # FIXME: This should be unified with MockExecutive2
</span><span class="cx"> class MockExecutive(object):
</span><span class="cx"> PIPE = "MOCK PIPE"
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemexecutive_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> error = ScriptError('', ('my', 'command'), -1, 'My output.', '/Users/username/blah')
</span><span class="cx"> self.assertEqual(error.message_with_output(), 'Failed to run "(\'my\', \'command\')" exit_code: -1 cwd: /Users/username/blah\n\nMy output.')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def never_ending_command():
</span><span class="cx"> """Arguments for a command that will never end (useful for testing process
</span><span class="cx"> killing). It should be a process that is unlikely to already be running
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystem_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_mock.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -137,7 +137,6 @@
</span><span class="cx"> dirs.append(dirpath)
</span><span class="cx"> return sorted(dirs)
</span><span class="cx">
</span><del>-
</del><span class="cx"> def files_under(self, path, dirs_to_skip=[], file_filter=None):
</span><span class="cx"> def filter_all(fs, dirpath, basename):
</span><span class="cx"> return True
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemfilesystem_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/filesystem_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -74,6 +74,7 @@
</span><span class="cx"> self.fs.chdir(self.generic_test_dir)
</span><span class="cx"> self.assertEqual(set(self.fs.glob('foo.*')), set(['foo.txt']))
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class RealFileSystemTest(unittest.TestCase, GenericFileSystemTests):
</span><span class="cx"> def setUp(self):
</span><span class="cx"> self.fs = FileSystem()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemlogutils_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/logutils_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/logutils_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/logutils_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -140,6 +140,7 @@
</span><span class="cx"> self._log.debug("test message")
</span><span class="cx"> self._assert_log_messages(["unittest: [DEBUG] test message\n"])
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ConfigureLoggingCustomLevelTest(ConfigureLoggingTestBase):
</span><span class="cx">
</span><span class="cx"> """Tests configure_logging() with a custom logging level."""
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystempathpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/path.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/path.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/path.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def abspath_to_uri(platform, path):
</span><span class="cx"> """Converts a platform-specific absolute path to a file: URL."""
</span><span class="cx"> return "file:" + _escape(_convert_path(platform, path))
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystempath_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/path_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> from webkitpy.common.system.platforminfo_mock import MockPlatformInfo
</span><span class="cx"> from webkitpy.common.system import path
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class AbspathTest(unittest.TestCase):
</span><span class="cx"> def platforminfo(self):
</span><span class="cx"> return SystemHost().platform
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfopy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> from webkitpy.common.system.executive import Executive
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class PlatformInfo(object):
</span><span class="cx"> """This class provides a consistent (and mockable) interpretation of
</span><span class="cx"> system-specific values (like sys.platform and platform.mac_ver())
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemuserpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/user.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/user.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/user.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -1,9 +1,9 @@
</span><span class="cx"> # Copyright (c) 2009, Google Inc. All rights reserved.
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="cx"> # met:
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # * Redistributions of source code must retain the above copyright
</span><span class="cx"> # notice, this list of conditions and the following disclaimer.
</span><span class="cx"> # * Redistributions in binary form must reproduce the above
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> # * Neither the name of Google Inc. nor the names of its
</span><span class="cx"> # contributors may be used to endorse or promote products derived from
</span><span class="cx"> # this software without specific prior written permission.
</span><del>-#
</del><ins>+#
</ins><span class="cx"> # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
</span><span class="cx"> # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
</span><span class="cx"> # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemuser_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/user_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/user_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/user_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> from webkitpy.common.system.outputcapture import OutputCapture
</span><span class="cx"> from webkitpy.common.system.user import User
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class UserTest(unittest.TestCase):
</span><span class="cx">
</span><span class="cx"> example_user_response = "example user response"
</span><span class="lines">@@ -37,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> def test_prompt_repeat(self):
</span><span class="cx"> self.repeatsRemaining = 2
</span><ins>+
</ins><span class="cx"> def mock_raw_input(message):
</span><span class="cx"> self.repeatsRemaining -= 1
</span><span class="cx"> if not self.repeatsRemaining:
</span><span class="lines">@@ -46,6 +48,7 @@
</span><span class="cx">
</span><span class="cx"> def test_prompt_when_exceeded_repeats(self):
</span><span class="cx"> self.repeatsRemaining = 2
</span><ins>+
</ins><span class="cx"> def mock_raw_input(message):
</span><span class="cx"> self.repeatsRemaining -= 1
</span><span class="cx"> return None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemworkspace_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/system/workspace_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> def test_create_zip(self):
</span><span class="cx"> workspace = Workspace(None, MockExecutive(should_log=True))
</span><span class="cx"> expected_logs = "MOCK run_command: ['zip', '-9', '-r', '/zip/path', '.'], cwd=/source/path\n"
</span><ins>+
</ins><span class="cx"> class MockZipFile(object):
</span><span class="cx"> def __init__(self, path):
</span><span class="cx"> self.filename = path
</span><span class="lines">@@ -65,6 +66,7 @@
</span><span class="cx">
</span><span class="cx"> MOCK output of child process
</span><span class="cx"> """
</span><ins>+
</ins><span class="cx"> class MockZipFile(object):
</span><span class="cx"> def __init__(self, path):
</span><span class="cx"> self.filename = path
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonthreadthreadedmessagequeuepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -49,4 +49,3 @@
</span><span class="cx"> is_running = self._is_running
</span><span class="cx"> self._messages = []
</span><span class="cx"> return (messages, is_running)
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonthreadthreadedmessagequeue_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/common/thread/threadedmessagequeue_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> from webkitpy.common.thread.threadedmessagequeue import ThreadedMessageQueue
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ThreadedMessageQueueTest(unittest.TestCase):
</span><span class="cx">
</span><span class="cx"> def test_basic(self):
</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 (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -75,7 +75,6 @@
</span><span class="cx"> tests_to_skip = self.skip_tests(potential_test_paths, tests, expectations, None)
</span><span class="cx"> return [test for test in tests if test not in tests_to_skip]
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _strip_test_dir_prefixes(self, paths):
</span><span class="cx"> return [self._strip_test_dir_prefix(path) for path in paths if path]
</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 (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -60,7 +60,6 @@
</span><span class="cx"> TestExpectations = test_expectations.TestExpectations
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class Manager(object):
</span><span class="cx"> """A class for managing running a series of tests on a series of layout
</span><span class="cx"> test files."""
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerstest_result_writerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> for failure in failures:
</span><span class="cx"> failure.write_failure(writer, driver_output, expected_driver_output, port)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TestResultWriter(object):
</span><span class="cx"> """A class which handles all writing operations to the result directory."""
</span><span class="cx">
</span><span class="lines">@@ -174,7 +175,7 @@
</span><span class="cx"> self._write_binary_file(diff_filename, image_diff)
</span><span class="cx">
</span><span class="cx"> base_dir = self._port.path_from_webkit_base('LayoutTests', 'fast', 'harness')
</span><del>-
</del><ins>+
</ins><span class="cx"> image_diff_template = self._filesystem.join(base_dir, 'image-diff-template.html');
</span><span class="cx"> image_diff_file = ""
</span><span class="cx"> if self._filesystem.exists(image_diff_template):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testslayout_packagejson_results_generatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -97,6 +97,7 @@
</span><span class="cx"> trie[directory] = {}
</span><span class="cx"> add_path_to_trie(rest, value, trie[directory])
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def test_timings_trie(port, individual_test_timings):
</span><span class="cx"> """Breaks a test name into chunks by directory and puts the test time as a value in the lowest part, e.g.
</span><span class="cx"> foo/bar/baz.html: 1ms
</span><span class="lines">@@ -118,6 +119,7 @@
</span><span class="cx">
</span><span class="cx"> return trie
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # FIXME: We already have a TestResult class in test_results.py
</span><span class="cx"> class TestResult(object):
</span><span class="cx"> """A simple class that represents a single test result."""
</span><span class="lines">@@ -329,7 +331,6 @@
</span><span class="cx"> _log.error("Upload failed: %s" % err)
</span><span class="cx"> return
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _get_test_timing(self, test_name):
</span><span class="cx"> """Returns test timing data (elapsed time) in second
</span><span class="cx"> for the given test_name."""
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testslint_test_expectations_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/lint_test_expectations_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -62,6 +62,7 @@
</span><span class="cx"> def path_to_generic_test_expectations_file(self):
</span><span class="cx"> return ''
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class FakeFactory(object):
</span><span class="cx"> def __init__(self, host, ports):
</span><span class="cx"> self.host = host
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_configurationpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_configuration.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> import itertools
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TestConfiguration(object):
</span><span class="cx"> def __init__(self, version, architecture, build_type):
</span><span class="cx"> self.version = version
</span><span class="lines">@@ -257,7 +258,6 @@
</span><span class="cx"> while try_abbreviating(self._collapsing_sets_by_size.values()):
</span><span class="cx"> pass
</span><span class="cx">
</span><del>-
</del><span class="cx"> # 4) Substitute specifier subsets that match macros witin each set:
</span><span class="cx"> # (xp, vista, win7, release) -> (win, release)
</span><span class="cx"> self.collapse_macros(self._configuration_macros, specifiers_list)
</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 (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -579,7 +579,6 @@
</span><span class="cx"> return item[0].upper()
</span><span class="cx"> raise ValueError(expectation)
</span><span class="cx">
</span><del>-
</del><span class="cx"> def add_expectation_line(self, expectation_line, in_skipped=False):
</span><span class="cx"> """Returns a list of warnings encountered while matching modifiers."""
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_failurespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -33,10 +33,12 @@
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def is_reftest_failure(failure_list):
</span><span class="cx"> failure_types = [type(f) for f in failure_list]
</span><span class="cx"> return set((FailureReftestMismatch, FailureReftestMismatchDidNotOccur, FailureReftestNoImagesGenerated)).intersection(failure_types)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # FIXME: This is backwards. Each TestFailure subclass should know what
</span><span class="cx"> # test_expectation type it corresponds too. Then this method just
</span><span class="cx"> # collects them all from the failure list and returns the worst one.
</span><span class="lines">@@ -236,6 +238,7 @@
</span><span class="cx"> writer.write_image_files(driver_output.image, expected_image=None)
</span><span class="cx"> writer.write_reftest(self.reference_filename)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class FailureReftestNoImagesGenerated(TestFailure):
</span><span class="cx"> def __init__(self, reference_filename=None):
</span><span class="cx"> super(FailureReftestNoImagesGenerated, self).__init__()
</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 (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -39,6 +39,7 @@
</span><span class="cx">
</span><span class="cx"> INTERRUPTED_EXIT_STATUS = signal.SIGINT + 128
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TestRunResults(object):
</span><span class="cx"> def __init__(self, expectations, num_tests):
</span><span class="cx"> self.total = num_tests
</span><span class="lines">@@ -123,6 +124,7 @@
</span><span class="cx">
</span><span class="cx"> return test_dict
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # These results must match ones in print_unexpected_results() in views/buildbot_results.py.
</span><span class="cx"> def summarize_results(port_obj, expectations, initial_results, retry_results, enabled_pixel_tests_in_retry, include_passes=False, include_time_and_modifiers=False):
</span><span class="cx"> """Returns a dictionary containing a summary of the test runs, with the following fields:
</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 (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -219,7 +219,6 @@
</span><span class="cx">
</span><span class="cx"> self.assertEqual(host.user.opened_urls, [path.abspath_to_uri(MockHost().platform, '/tmp/layout-test-results/results.html')])
</span><span class="cx">
</span><del>-
</del><span class="cx"> def test_batch_size(self):
</span><span class="cx"> batch_tests_run = get_test_batches(['--batch-size', '2'])
</span><span class="cx"> for batch in batch_tests_run:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsmetered_stream_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -107,6 +107,7 @@
</span><span class="cx"> self.logger.info('foo %s %d', 'bar', 2)
</span><span class="cx"> self.assertEqual(self.buflist, ['foo bar 2\n'])
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TtyTest(RegularTest):
</span><span class="cx"> verbose = False
</span><span class="cx"> isatty = True
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsprintingpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -345,7 +345,6 @@
</span><span class="cx"> else:
</span><span class="cx"> return ' failed%s (%s)' % (exp_string, ', '.join(failure.message() for failure in failures))
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _print_test_trace(self, result, exp_str, got_str):
</span><span class="cx"> test_name = result.test_name
</span><span class="cx"> self._print_default(self._test_status_line(test_name, ''))
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyperformance_testsperftestsrunnerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -76,7 +76,6 @@
</span><span class="cx"> self._timestamp = time.time()
</span><span class="cx"> self._utc_timestamp = datetime.datetime.utcnow()
</span><span class="cx">
</span><del>-
</del><span class="cx"> @staticmethod
</span><span class="cx"> def _parse_args(args=None):
</span><span class="cx"> def _expand_path(option, opt_str, value, parser):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyperformance_testsperftestsrunner_integrationtestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -213,6 +213,7 @@
</span><span class="cx">
</span><span class="cx"> class TestDriverWithStopCount(TestDriver):
</span><span class="cx"> stop_count = 0
</span><ins>+
</ins><span class="cx"> def stop(self):
</span><span class="cx"> TestDriverWithStopCount.stop_count += 1
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbase_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/base_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> from webkitpy.port import Port, Driver, DriverOutput
</span><span class="cx"> from webkitpy.port.test import add_unit_tests_to_mock_filesystem, TestPort
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class PortTest(unittest.TestCase):
</span><span class="cx"> def make_port(self, executive=None, with_tests=False, port_name=None, **kwargs):
</span><span class="cx"> host = MockSystemHost()
</span><span class="lines">@@ -88,7 +89,6 @@
</span><span class="cx"> self.assertEqual(port.pretty_patch.pretty_patch_text("patch.txt"),
</span><span class="cx"> port.pretty_patch.pretty_patch_error_html)
</span><span class="cx">
</span><del>-
</del><span class="cx"> def test_diff_text(self):
</span><span class="cx"> port = self.make_port()
</span><span class="cx"> # Make sure that we don't run into decoding exceptions when the
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -115,6 +115,7 @@
</span><span class="cx"> for pattern in patterns:
</span><span class="cx"> self.error = re.sub(pattern[0], pattern[1], self.error)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class Driver(object):
</span><span class="cx"> """object for running test(s) using DumpRenderTree/WebKitTestRunner."""
</span><span class="cx">
</span><span class="lines">@@ -624,6 +625,7 @@
</span><span class="cx"> else:
</span><span class="cx"> self.decoded_content = self.content
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class DriverProxy(object):
</span><span class="cx"> """A wrapper for managing two Driver instances, one with pixel tests and
</span><span class="cx"> one without. This allows us to handle plain text tests and ref tests with a
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriver_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class DriverOutputTest(unittest.TestCase):
</span><span class="cx"> def test_strip_metrics(self):
</span><span class="cx"> patterns = [
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportfactorypy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/factory.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/factory.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/factory.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _builder_options(builder_name):
</span><span class="cx"> configuration = "Debug" if re.search(r"[d|D](ebu|b)g", builder_name) else "Release"
</span><span class="cx"> is_webkit2 = builder_name.find("WK2") != -1
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx">
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class GtkPort(Port):
</span><span class="cx"> port_name = "gtk"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportserver_process_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> from webkitpy.common.system.outputcapture import OutputCapture
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class TrivialMockPort(object):
</span><span class="cx"> def __init__(self):
</span><span class="cx"> self.host = MockSystemHost()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporttestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/test.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/test.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/test.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -105,6 +105,7 @@
</span><span class="cx"> UNEXPECTED_PASSES = 7
</span><span class="cx"> UNEXPECTED_FAILURES = 17
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def unit_test_list():
</span><span class="cx"> silent_audio = "RIFF2\x00\x00\x00WAVEfmt \x10\x00\x00\x00\x01\x00\x01\x00\x22\x56\x00\x00\x44\xAC\x00\x00\x02\x00\x10\x00data\x0E\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
</span><span class="cx"> silent_audio_with_single_bit_difference = "RIFF2\x00\x00\x00WAVEfmt \x10\x00\x00\x00\x01\x00\x01\x00\x22\x56\x00\x00\x44\xAC\x00\x00\x02\x00\x10\x00data\x0E\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00"
</span><span class="lines">@@ -524,6 +525,7 @@
</span><span class="cx"> def all_baseline_variants(self):
</span><span class="cx"> return self.ALL_BASELINE_VARIANTS
</span><span class="cx">
</span><ins>+
</ins><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="trunkToolsScriptswebkitpyportwinpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/win.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/win.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> except ImportError:
</span><span class="cx"> _log.warn("Not running on native Windows.")
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class WinPort(ApplePort):
</span><span class="cx"> port_name = "win"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checker.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checker.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checker.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -134,7 +134,7 @@
</span><span class="cx"> # API and therefore do not follow the same header including
</span><span class="cx"> # discipline as WebCore.
</span><span class="cx">
</span><del>- ([# TestNetscapePlugIn has no config.h and uses funny names like
</del><ins>+ ([ # TestNetscapePlugIn has no config.h and uses funny names like
</ins><span class="cx"> # NPP_SetWindow.
</span><span class="cx"> os.path.join('Tools', 'DumpRenderTree', 'TestNetscapePlugIn')],
</span><span class="cx"> ["-build/include",
</span><span class="lines">@@ -512,6 +512,7 @@
</span><span class="cx"> CMAKE = 11
</span><span class="cx"> FEATUREDEFINES = 12
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CheckerDispatcher(object):
</span><span class="cx">
</span><span class="cx"> """Supports determining whether and how to check style, based on path."""
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscommon_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/common_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/common_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/common_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> from common import CarriageReturnChecker
</span><span class="cx"> from common import TabChecker
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # FIXME: The unit tests for the cpp, text, and common checkers should
</span><span class="cx"> # share supporting test code. This can include, for example, the
</span><span class="cx"> # mock style error handling code and the code to check that all
</span><span class="lines">@@ -43,7 +44,7 @@
</span><span class="cx"> "better to use only a \\n")
</span><span class="cx">
</span><span class="cx"> def setUp(self):
</span><del>- self._style_errors = [] # The list of accumulated style errors.
</del><ins>+ self._style_errors = [] # The list of accumulated style errors.
</ins><span class="cx">
</span><span class="cx"> def _mock_style_error_handler(self, line_number, category, confidence,
</span><span class="cx"> message):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpppy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -205,7 +205,6 @@
</span><span class="cx"> return text.lower()
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _create_acronym(text):
</span><span class="cx"> """Creates an acronym for the given text."""
</span><span class="cx"> # Removes all lower case letters except those starting words.
</span><span class="lines">@@ -230,14 +229,15 @@
</span><span class="cx"> """
</span><span class="cx"> i = 1
</span><span class="cx"> for pos, c in enumerate(s):
</span><del>- if c == '(':
- i += 1
- elif c == ')':
- i -= 1
- if i == 0:
- return s[:pos], s[pos + 1:]
</del><ins>+ if c == '(':
+ i += 1
+ elif c == ')':
+ i -= 1
+ if i == 0:
+ return s[:pos], s[pos + 1:]
</ins><span class="cx"> return None, None
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class _IncludeState(dict):
</span><span class="cx"> """Tracks line numbers for includes, and the order in which includes appear.
</span><span class="cx">
</span><span class="lines">@@ -540,12 +540,12 @@
</span><span class="cx"> self._parameter_list = None
</span><span class="cx">
</span><span class="cx"> def modifiers_and_return_type(self):
</span><del>- """Returns the modifiers and the return type."""
- # Go backwards from where the function name is until we encounter one of several things:
- # ';' or '{' or '}' or 'private:', etc. or '#' or return Position(0, 0)
- elided = self._clean_lines.elided
- start_modifiers = _rfind_in_lines(r';|\{|\}|((private|public|protected):)|(#.*)', elided, self.parameter_start_position, Position(0, 0))
- return SingleLineView(elided, start_modifiers, self.function_name_start_position).single_line.strip()
</del><ins>+ """Returns the modifiers and the return type."""
+ # Go backwards from where the function name is until we encounter one of several things:
+ # ';' or '{' or '}' or 'private:', etc. or '#' or return Position(0, 0)
+ elided = self._clean_lines.elided
+ start_modifiers = _rfind_in_lines(r';|\{|\}|((private|public|protected):)|(#.*)', elided, self.parameter_start_position, Position(0, 0))
+ return SingleLineView(elided, start_modifiers, self.function_name_start_position).single_line.strip()
</ins><span class="cx">
</span><span class="cx"> def is_virtual(self):
</span><span class="cx"> return bool(search(r'\bvirtual\b', self.modifiers_and_return_type()))
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx"> error(line_number, 'readability/fn_size', error_level,
</span><span class="cx"> 'Small and focused functions are preferred:'
</span><span class="cx"> ' %s has %d non-comment lines'
</span><del>- ' (error triggered by exceeding %d lines).' % (
</del><ins>+ ' (error triggered by exceeding %d lines).' % (
</ins><span class="cx"> self.current_function, self.lines_in_function, trigger))
</span><span class="cx">
</span><span class="cx"> def end(self):
</span><span class="lines">@@ -638,7 +638,6 @@
</span><span class="cx"> prefix = os.path.commonprefix([root_dir, project_dir])
</span><span class="cx"> return fullname[len(prefix) + 1:]
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Not SVN <= 1.6? Try to find a git, or svn top level directory by
</span><span class="cx"> # searching up from the current path.
</span><span class="cx"> root_dir = os.path.dirname(fullname)
</span><span class="lines">@@ -882,6 +881,7 @@
</span><span class="cx"> # The given item was not closed.
</span><span class="cx"> return Position(len(elided), -1)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_for_copyright(lines, error):
</span><span class="cx"> """Logs an error if no Copyright message appears at the top of the file."""
</span><span class="cx">
</span><span class="lines">@@ -1280,6 +1280,7 @@
</span><span class="cx"> return True
</span><span class="cx"> return True
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_for_non_standard_constructs(clean_lines, line_number,
</span><span class="cx"> class_state, error):
</span><span class="cx"> """Logs an error if we see certain non-ANSI constructs ignored by gcc-2.
</span><span class="lines">@@ -2069,6 +2070,7 @@
</span><span class="cx"> else:
</span><span class="cx"> break
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def get_previous_non_blank_line(clean_lines, line_number):
</span><span class="cx"> """Return the most recent non-blank line and its line number.
</span><span class="cx">
</span><span class="lines">@@ -2104,7 +2106,7 @@
</span><span class="cx"> error: The function to call with any errors found.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- line = clean_lines.elided[line_number] # Get rid of comments and strings.
</del><ins>+ line = clean_lines.elided[line_number] # Get rid of comments and strings.
</ins><span class="cx">
</span><span class="cx"> namespace_match = match(r'(?P<namespace_indentation>\s*)namespace\s+\S+\s*{\s*$', line)
</span><span class="cx"> if not namespace_match:
</span><span class="lines">@@ -2117,9 +2119,9 @@
</span><span class="cx"> error(line_number, 'whitespace/indent', 4,
</span><span class="cx"> 'namespace should never be indented.')
</span><span class="cx"> return
</span><del>- looking_for_semicolon = False;
</del><ins>+ looking_for_semicolon = False
</ins><span class="cx"> line_offset = 0
</span><del>- in_preprocessor_directive = False;
</del><ins>+ in_preprocessor_directive = False
</ins><span class="cx"> for current_line in clean_lines.elided[line_number + 1:]:
</span><span class="cx"> line_offset += 1
</span><span class="cx"> if not current_line.strip():
</span><span class="lines">@@ -2130,21 +2132,22 @@
</span><span class="cx"> file_state.set_did_inside_namespace_indent_warning()
</span><span class="cx"> error(line_number + line_offset, 'whitespace/indent', 4,
</span><span class="cx"> 'Code inside a namespace should not be indented.')
</span><del>- if in_preprocessor_directive or (current_line.strip()[0] == '#'): # This takes care of preprocessor directive syntax.
</del><ins>+ if in_preprocessor_directive or (current_line.strip()[0] == '#'): # This takes care of preprocessor directive syntax.
</ins><span class="cx"> in_preprocessor_directive = current_line[-1] == '\\'
</span><span class="cx"> else:
</span><span class="cx"> looking_for_semicolon = ((current_line.find(';') == -1) and (current_line.strip()[-1] != '}')) or (current_line[-1] == '\\')
</span><span class="cx"> else:
</span><del>- looking_for_semicolon = False; # If we have a brace we may not need a semicolon.
</del><ins>+ looking_for_semicolon = False # If we have a brace we may not need a semicolon.
</ins><span class="cx"> current_indentation_level += current_line.count('{') - current_line.count('}')
</span><span class="cx"> current_indentation_level += current_line.count('(') - current_line.count(')')
</span><span class="cx"> if current_indentation_level < 0:
</span><del>- break;
</del><ins>+ break
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Enum declaration whitelist
</span><span class="cx"> _ALLOW_ALL_UPPERCASE_ENUM = ['JSTokenType']
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_enum_casing(clean_lines, line_number, enum_state, error):
</span><span class="cx"> """Looks for incorrectly named enum values.
</span><span class="cx">
</span><span class="lines">@@ -2162,6 +2165,7 @@
</span><span class="cx"> error(line_number, 'readability/enum_casing', 4,
</span><span class="cx"> 'enum members should use InterCaps with an initial capital letter or initial \'k\' for C-style enums.')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_directive_indentation(clean_lines, line_number, file_state, error):
</span><span class="cx"> """Looks for indentation of preprocessor directives.
</span><span class="cx">
</span><span class="lines">@@ -2188,6 +2192,7 @@
</span><span class="cx"> initial_spaces += 1
</span><span class="cx"> return initial_spaces
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_indentation_amount(clean_lines, line_number, error):
</span><span class="cx"> line = clean_lines.elided[line_number]
</span><span class="cx"> initial_spaces = get_initial_spaces_for_line(line)
</span><span class="lines">@@ -2221,7 +2226,7 @@
</span><span class="cx"> if file_state.is_c_or_objective_c():
</span><span class="cx"> return
</span><span class="cx">
</span><del>- line = clean_lines.elided[line_number] # Get rid of comments and strings.
</del><ins>+ line = clean_lines.elided[line_number] # Get rid of comments and strings.
</ins><span class="cx">
</span><span class="cx"> using_std_match = match(r'\s*using\s+std::(?P<method_name>\S+)\s*;\s*$', line)
</span><span class="cx"> if not using_std_match:
</span><span class="lines">@@ -2256,6 +2261,7 @@
</span><span class="cx"> error(line_number, 'build/using_namespace', 4,
</span><span class="cx"> "Do not use 'using namespace %s;'." % method_name)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_max_min_macros(clean_lines, line_number, file_state, error):
</span><span class="cx"> """Looks for use of MAX() and MIN() macros that should be replaced with std::max() and std::min().
</span><span class="cx">
</span><span class="lines">@@ -2271,7 +2277,7 @@
</span><span class="cx"> if file_state.is_c_or_objective_c():
</span><span class="cx"> return
</span><span class="cx">
</span><del>- line = clean_lines.elided[line_number] # Get rid of comments and strings.
</del><ins>+ line = clean_lines.elided[line_number] # Get rid of comments and strings.
</ins><span class="cx">
</span><span class="cx"> max_min_macros_search = search(r'\b(?P<max_min_macro>(MAX|MIN))\s*\(', line)
</span><span class="cx"> if not max_min_macros_search:
</span><span class="lines">@@ -2331,6 +2337,7 @@
</span><span class="cx"> 'Use equivelent function in <wtf/ASCIICType.h> instead of the %s() function.'
</span><span class="cx"> % (ctype_function))
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_switch_indentation(clean_lines, line_number, error):
</span><span class="cx"> """Looks for indentation errors inside of switch statements.
</span><span class="cx">
</span><span class="lines">@@ -2340,7 +2347,7 @@
</span><span class="cx"> error: The function to call with any errors found.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- line = clean_lines.elided[line_number] # Get rid of comments and strings.
</del><ins>+ line = clean_lines.elided[line_number] # Get rid of comments and strings.
</ins><span class="cx">
</span><span class="cx"> switch_match = match(r'(?P<switch_indentation>\s*)switch\s*\(.+\)\s*{\s*$', line)
</span><span class="cx"> if not switch_match:
</span><span class="lines">@@ -2368,7 +2375,7 @@
</span><span class="cx"> # still catch all indentation issues in practice.
</span><span class="cx"> encountered_nested_switch = True
</span><span class="cx">
</span><del>- current_indentation_match = match(r'(?P<indentation>\s*)(?P<remaining_line>.*)$', current_line);
</del><ins>+ current_indentation_match = match(r'(?P<indentation>\s*)(?P<remaining_line>.*)$', current_line)
</ins><span class="cx"> current_indentation = current_indentation_match.group('indentation')
</span><span class="cx"> remaining_line = current_indentation_match.group('remaining_line')
</span><span class="cx">
</span><span class="lines">@@ -2410,7 +2417,7 @@
</span><span class="cx"> error: The function to call with any errors found.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- line = clean_lines.elided[line_number] # Get rid of comments and strings.
</del><ins>+ line = clean_lines.elided[line_number] # Get rid of comments and strings.
</ins><span class="cx">
</span><span class="cx"> if match(r'\s*{\s*$', line):
</span><span class="cx"> # We allow an open brace to start a line in the case where someone
</span><span class="lines">@@ -2521,7 +2528,7 @@
</span><span class="cx"> error: The function to call with any errors found.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- line = clean_lines.elided[line_number] # Get rid of comments and strings.
</del><ins>+ line = clean_lines.elided[line_number] # Get rid of comments and strings.
</ins><span class="cx">
</span><span class="cx"> else_match = match(r'(?P<else_indentation>\s*)(\}\s*)?else(\s+if\s*\(|(?P<else>\s*(\{\s*)?\Z))', line)
</span><span class="cx"> if not else_match:
</span><span class="lines">@@ -2551,7 +2558,7 @@
</span><span class="cx"> if current_line == else_indentation + '}':
</span><span class="cx"> continue
</span><span class="cx">
</span><del>- current_indentation_match = match(r'(?P<indentation>\s*)(?P<remaining_line>.*)$', current_line);
</del><ins>+ current_indentation_match = match(r'(?P<indentation>\s*)(?P<remaining_line>.*)$', current_line)
</ins><span class="cx"> current_indentation = current_indentation_match.group('indentation')
</span><span class="cx"> remaining_line = current_indentation_match.group('remaining_line')
</span><span class="cx">
</span><span class="lines">@@ -2717,6 +2724,7 @@
</span><span class="cx"> if search(r'\bNULL\b', line) and search(r'\bNULL\b', CleansedLines.collapse_strings(line)):
</span><span class="cx"> error(line_number, 'readability/null', 4, 'Use nullptr instead of NULL (even in *comments*).')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def get_line_width(line):
</span><span class="cx"> """Determines the width of the line in column positions.
</span><span class="cx">
</span><span class="lines">@@ -3273,6 +3281,7 @@
</span><span class="cx"> 'Consider using toText helper function in WebCore/dom/Text.h '
</span><span class="cx"> 'instead of static_cast<Text*>')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_identifier_name_in_declaration(filename, line_number, line, file_state, error):
</span><span class="cx"> """Checks if identifier names contain any underscores.
</span><span class="cx">
</span><span class="lines">@@ -3421,6 +3430,7 @@
</span><span class="cx"> number_of_identifiers += 1
</span><span class="cx"> line = line[matched.end():]
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def check_c_style_cast(line_number, line, raw_line, cast_type, pattern,
</span><span class="cx"> error):
</span><span class="cx"> """Checks for a C-style cast by looking for the pattern.
</span><span class="lines">@@ -3684,7 +3694,7 @@
</span><span class="cx">
</span><span class="cx"> # include_state is modified during iteration, so we iterate over a copy of
</span><span class="cx"> # the keys.
</span><del>- for header in include_state.keys(): #NOLINT
</del><ins>+ for header in include_state.keys(): # NOLINT
</ins><span class="cx"> (same_module, common_path) = files_belong_to_same_module(abs_filename, header)
</span><span class="cx"> fullpath = common_path + header
</span><span class="cx"> if same_module and update_include_state(fullpath, include_state):
</span><span class="lines">@@ -3718,6 +3728,7 @@
</span><span class="cx"> error(line_number, 'build/cpp_comment', 5, 'CPP comments are not allowed in Platform.h, '
</span><span class="cx"> 'please use C comments /* ... */')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def process_line(filename, file_extension,
</span><span class="cx"> clean_lines, line, include_state, function_state,
</span><span class="cx"> class_state, file_state, enum_state, asm_state, error):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerscpp_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/cpp_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> from cpp import CppChecker
</span><span class="cx"> from ..filter import FilterConfiguration
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> # This class works as an error collector and replaces cpp_style.Error
</span><span class="cx"> # function for the unit tests. We also verify each category we see
</span><span class="cx"> # is in CppChecker.categories, to help keep that list up to date.
</span><span class="lines">@@ -231,6 +232,7 @@
</span><span class="cx"> self.assertEqual(error_collector.results(),
</span><span class="cx"> 'The parameter name "ooF" adds no information, so it should be removed. [readability/parameter_name] [5]')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CppStyleTestBase(unittest.TestCase):
</span><span class="cx"> """Provides some useful helper functions for cpp_style tests.
</span><span class="cx">
</span><span class="lines">@@ -242,7 +244,7 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: Refactor the unit tests so the confidence level is passed
</span><span class="cx"> # explicitly, just like it is in the real code.
</span><del>- min_confidence = 1;
</del><ins>+ min_confidence = 1
</ins><span class="cx">
</span><span class="cx"> # Helper function to avoid needing to explicitly pass confidence
</span><span class="cx"> # in all the unit test calls to cpp_style.process_file_data().
</span><span class="lines">@@ -758,6 +760,7 @@
</span><span class="cx"> def test_rvaule_reference_in_parameter_pack(self):
</span><span class="cx"> self.assert_lint('void requestCompleted(Arguments&&... arguments)', '')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CppStyleTest(CppStyleTestBase):
</span><span class="cx">
</span><span class="cx"> def test_asm_lines_ignored(self):
</span><span class="lines">@@ -2077,7 +2080,7 @@
</span><span class="cx"> ' [whitespace/comments] [5]')
</span><span class="cx"> self.assert_lint('printf("foo"); // Outside quotes.',
</span><span class="cx"> '')
</span><del>- self.assert_lint('int i = 0; // Having one space is fine.','')
</del><ins>+ self.assert_lint('int i = 0; // Having one space is fine.', '')
</ins><span class="cx"> self.assert_lint('int i = 0; // Having two spaces is bad.',
</span><span class="cx"> 'One space before end of line comments'
</span><span class="cx"> ' [whitespace/comments] [5]')
</span><span class="lines">@@ -2714,6 +2717,7 @@
</span><span class="cx"> self.assert_lint('int a = 1 ? 0 : 30;', '')
</span><span class="cx"> self.assert_lint('bool a : 1;', '')
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class CleansedLinesTest(unittest.TestCase):
</span><span class="cx"> def test_init(self):
</span><span class="cx"> lines = ['Line 1',
</span><span class="lines">@@ -5222,7 +5226,6 @@
</span><span class="cx"> self.assert_lint('Ref<Node> protector = node;', '')
</span><span class="cx"> self.assert_lint('Ref<Node> protector = *node;', '')
</span><span class="cx">
</span><del>-
</del><span class="cx"> # Invalid protector RefPtr/Ref variable names.
</span><span class="cx"> self.assert_lint('RefPtr<Node> protector(this);', "'protector' is incorrectly named. It should be named 'protectedThis'. [readability/naming/protected] [4]")
</span><span class="cx"> self.assert_lint('Ref<Node> protector(*this);', "'protector' is incorrectly named. It should be named 'protectedThis'. [readability/naming/protected] [4]")
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckersjspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/js.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/js.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/js.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> from common import TabChecker
</span><span class="cx"> import re
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class JSChecker(object):
</span><span class="cx"> """Processes JavaScript lines for checking style."""
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckersjsoncheckerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> import re
</span><span class="cx"> from sets import Set
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class JSONChecker(object):
</span><span class="cx"> """Processes JSON lines for checking style."""
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerspngpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/png.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/png.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/png.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> from webkitpy.common.system.systemhost import SystemHost
</span><span class="cx"> from webkitpy.common.checkout.scm.detection import SCMDetector
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class PNGChecker(object):
</span><span class="cx"> """Check svn:mime-type for checking style"""
</span><span class="cx">
</span><span class="lines">@@ -72,4 +73,3 @@
</span><span class="cx"> if prop_get != "image/png":
</span><span class="cx"> errorstr = "Set the svn:mime-type property (svn propset svn:mime-type image/png %s)." % self._file_path
</span><span class="cx"> self._handle_style_error(0, 'image/png', 5, errorstr)
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerstextpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/text.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/text.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/text.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx">
</span><span class="cx"> from common import TabChecker
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TextChecker(object):
</span><span class="cx">
</span><span class="cx"> """Processes text lines for checking style."""
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylecheckerstext_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/checkers/text_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/checkers/text_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/text_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> import text as text_style
</span><span class="cx"> from text import TextChecker
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TextStyleTestCase(unittest.TestCase):
</span><span class="cx"> """TestCase for text_style.py"""
</span><span class="cx">
</span><span class="lines">@@ -64,13 +65,11 @@
</span><span class="cx"> self.process_file_data('', lines, error_for_test)
</span><span class="cx"> self.assertTrue(self.had_error, '%s should have an error [whitespace/tab].' % lines)
</span><span class="cx">
</span><del>-
</del><span class="cx"> def test_no_error(self):
</span><span class="cx"> """Tests for no error cases."""
</span><span class="cx"> self.assertNoError([''])
</span><span class="cx"> self.assertNoError(['abc def', 'ggg'])
</span><span class="cx">
</span><del>-
</del><span class="cx"> def test_error(self):
</span><span class="cx"> """Tests for error cases."""
</span><span class="cx"> self.assertError(['2009-12-16\tKent Tamura\t<tkent@chromium.org>'], 1)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystyleerror_handlerspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/error_handlers.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/error_handlers.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/error_handlers.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> def _add_reportable_error(self, category):
</span><span class="cx"> """Increment the error count and return the new category total."""
</span><del>- self._increment_error_count() # Increment the total.
</del><ins>+ self._increment_error_count() # Increment the total.
</ins><span class="cx">
</span><span class="cx"> # Increment the category total.
</span><span class="cx"> if not category in self._category_totals:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpystylefilterpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/filter.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/filter.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/filter.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> filter_rules = []
</span><span class="cx">
</span><span class="cx"> self._filter_rules = filter_rules
</span><del>- self._should_check_category = {} # Cached dictionary of category to True/False
</del><ins>+ self._should_check_category = {} # Cached dictionary of category to True/False
</ins><span class="cx">
</span><span class="cx"> def __str__(self):
</span><span class="cx"> return ",".join(self._filter_rules)
</span><span class="lines">@@ -108,12 +108,12 @@
</span><span class="cx"> if category in self._should_check_category:
</span><span class="cx"> return self._should_check_category[category]
</span><span class="cx">
</span><del>- should_check = True # All categories checked by default.
</del><ins>+ should_check = True # All categories checked by default.
</ins><span class="cx"> for rule in self._filter_rules:
</span><span class="cx"> if not category.startswith(rule[1:]):
</span><span class="cx"> continue
</span><span class="cx"> should_check = rule.startswith('+')
</span><del>- self._should_check_category[category] = should_check # Update cache.
</del><ins>+ self._should_check_category[category] = should_check # Update cache.
</ins><span class="cx"> return should_check
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> for sub_path in sub_paths:
</span><span class="cx"> if path.find(sub_path) > -1:
</span><span class="cx"> return tuple(path_rules)
</span><del>- return () # Default to the empty tuple.
</del><ins>+ return () # Default to the empty tuple.
</ins><span class="cx">
</span><span class="cx"> def _filter_from_path_rules(self, path_rules):
</span><span class="cx"> """Return the CategoryFilter associated to the given path rules.
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> # We reuse the same CategoryFilter where possible to take
</span><span class="cx"> # advantage of the caching they do.
</span><span class="cx"> if path_rules not in self._path_rules_to_filter:
</span><del>- rules = list(self._base_rules) # Make a copy
</del><ins>+ rules = list(self._base_rules) # Make a copy
</ins><span class="cx"> rules.extend(path_rules)
</span><span class="cx"> rules.extend(self._user_rules)
</span><span class="cx"> self._path_rules_to_filter[path_rules] = _CategoryFilter(rules)
</span><span class="lines">@@ -275,4 +275,3 @@
</span><span class="cx">
</span><span class="cx"> """
</span><span class="cx"> return self._filter_from_path(path).should_check(category)
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpystylefilter_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/filter_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/filter_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/filter_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> #
</span><span class="cx"> # (from http://docs.python.org/reference/datamodel.html#object.__ne__ )
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class ValidateFilterRulesTest(unittest.TestCase):
</span><span class="cx">
</span><span class="cx"> """Tests validate_filter_rules() function."""
</span><span class="lines">@@ -253,4 +254,3 @@
</span><span class="cx">
</span><span class="cx"> self.assertFalse(config.should_check("a", "path"))
</span><span class="cx"> self.assertTrue(config.should_check("b", "path"))
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpystyleoptparserpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/optparser.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/optparser.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/optparser.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -204,7 +204,7 @@
</span><span class="cx"> """Supports the printing of check-webkit-style command arguments."""
</span><span class="cx">
</span><span class="cx"> def _flag_pair_to_string(self, flag_key, flag_value):
</span><del>- return '--%(key)s=%(val)s' % {'key': flag_key, 'val': flag_value }
</del><ins>+ return '--%(key)s=%(val)s' % {'key': flag_key, 'val': flag_value}
</ins><span class="cx">
</span><span class="cx"> def to_flag_string(self, options):
</span><span class="cx"> """Return a flag string of the given CommandOptionValues instance.
</span><span class="lines">@@ -468,4 +468,3 @@
</span><span class="cx"> git_index=git_index)
</span><span class="cx">
</span><span class="cx"> return (paths, options)
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpystyleoptparser_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/style/optparser_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/style/optparser_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/style/optparser_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> """Return an ArgumentParser instance for testing."""
</span><span class="cx"> default_options = self._create_defaults()
</span><span class="cx">
</span><del>- all_categories = ["build" ,"whitespace"]
</del><ins>+ all_categories = ["build", "whitespace"]
</ins><span class="cx">
</span><span class="cx"> mock_stderr = self._MockStdErr()
</span><span class="cx">
</span><span class="lines">@@ -123,19 +123,19 @@
</span><span class="cx"> self.assertRaises(SystemExit, parse, ['--min-confidence=6'])
</span><span class="cx"> self.assertLog(['ERROR: option --min-confidence: invalid integer: 6: '
</span><span class="cx"> 'value must be between 1 and 5\n'])
</span><del>- parse(['--min-confidence=1']) # works
- parse(['--min-confidence=5']) # works
</del><ins>+ parse(['--min-confidence=1']) # works
+ parse(['--min-confidence=5']) # works
</ins><span class="cx">
</span><span class="cx"> self.assertRaises(SystemExit, parse, ['--output=bad'])
</span><span class="cx"> self.assertLog(['ERROR: option --output-format: invalid choice: '
</span><span class="cx"> "'bad' (choose from 'emacs', 'vs7')\n"])
</span><del>- parse(['--output=vs7']) # works
</del><ins>+ parse(['--output=vs7']) # works
</ins><span class="cx">
</span><span class="cx"> # Pass a filter rule not beginning with + or -.
</span><span class="cx"> self.assertRaises(SystemExit, parse, ['--filter=build'])
</span><span class="cx"> self.assertLog(['ERROR: Invalid filter rule "build": '
</span><span class="cx"> 'every rule must start with + or -.\n'])
</span><del>- parse(['--filter=+build']) # works
</del><ins>+ parse(['--filter=+build']) # works
</ins><span class="cx">
</span><span class="cx"> def test_parse_default_arguments(self):
</span><span class="cx"> parse = self._parse
</span><span class="lines">@@ -208,12 +208,12 @@
</span><span class="cx">
</span><span class="cx"> # Check argument validation.
</span><span class="cx"> self.assertRaises(ValueError, ProcessorOptions, output_format="bad")
</span><del>- ProcessorOptions(output_format="emacs") # No ValueError: works
- ProcessorOptions(output_format="vs7") # works
</del><ins>+ ProcessorOptions(output_format="emacs") # No ValueError: works
+ ProcessorOptions(output_format="vs7") # works
</ins><span class="cx"> self.assertRaises(ValueError, ProcessorOptions, min_confidence=0)
</span><span class="cx"> self.assertRaises(ValueError, ProcessorOptions, min_confidence=6)
</span><del>- ProcessorOptions(min_confidence=1) # works
- ProcessorOptions(min_confidence=5) # works
</del><ins>+ ProcessorOptions(min_confidence=1) # works
+ ProcessorOptions(min_confidence=5) # works
</ins><span class="cx">
</span><span class="cx"> # Check attributes.
</span><span class="cx"> options = ProcessorOptions(filter_rules=["+"],
</span><span class="lines">@@ -260,4 +260,3 @@
</span><span class="cx"> # Thus, just check the distinguishing case to verify that the
</span><span class="cx"> # code defines __ne__.
</span><span class="cx"> self.assertFalse(ProcessorOptions().__ne__(ProcessorOptions()))
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpytestmainpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/test/main.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/test/main.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/test/main.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx">
</span><span class="cx"> json.dump(results, stream, separators=(',', ':'))
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class Tester(object):
</span><span class="cx"> def __init__(self, filesystem=None):
</span><span class="cx"> self.finder = Finder(filesystem or FileSystem())
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_converterpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_converter.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_converter.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_converter.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -223,4 +223,3 @@
</span><span class="cx">
</span><span class="cx"> def handle_pi(self, data):
</span><span class="cx"> self.converted_data.extend(['<?', data, '>'])
</span><del>-
</del></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_converter_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_converter_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> DUMMY_FILENAME = 'dummy.html'
</span><span class="cx"> DUMMY_PATH = 'dummy/testharness/path'
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class W3CTestConverterTest(unittest.TestCase):
</span><span class="cx">
</span><span class="cx"> # FIXME: When we move to using a MockHost, this method should be removed, since
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_importer_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -64,6 +64,7 @@
</span><span class="cx"> ]
</span><span class="cx"> ''' }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class TestImporterTest(unittest.TestCase):
</span><span class="cx">
</span><span class="cx"> def _parse_options(self, args):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyxcodesimulatorpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/xcode/simulator.py (202361 => 202362)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2016-06-23 00:19:53 UTC (rev 202361)
+++ trunk/Tools/Scripts/webkitpy/xcode/simulator.py 2016-06-23 01:13:45 UTC (rev 202362)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> Do not use PyObjC to dlopen the framework.
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class DeviceType(object):
</span><span class="cx"> """
</span><span class="cx"> Represents a CoreSimulator device type.
</span></span></pre>
</div>
</div>
</body>
</html>