Diff
Modified: trunk/Tools/ChangeLog (268924 => 268925)
--- trunk/Tools/ChangeLog 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/ChangeLog 2020-10-23 16:13:28 UTC (rev 268925)
@@ -1,3 +1,21 @@
+2020-10-23 Aakash Jain <aakash_j...@apple.com>
+
+ Rename slave to worker in webkitpy
+ https://bugs.webkit.org/show_bug.cgi?id=218123
+
+ Reviewed by Jonathan Bedard.
+
+ * Scripts/webkitpy/common/net/buildbot/buildbot.py:
+ * Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py:
+ * Scripts/webkitpy/common/net/resultsjsonparser_unittest.py:
+ * Scripts/webkitpy/common/system/crashlogs_unittest.py:
+ * Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ * Scripts/webkitpy/port/leakdetector_unittest.py:
+ * Scripts/webkitpy/style/checkers/jsonchecker_unittest.py:
+
2020-10-22 Alex Christensen <achristen...@webkit.org>
Null check platformStrategies when making blob read stream for an NSURLRequest
Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -315,7 +315,7 @@
# If revision_string has non-digits assume it's not a revision number.
builder['built_revision'] = int(revision_string) if not re.match(r'\D', revision_string) else None
- # FIXME: We treat slave lost as green even though it is not to
+ # FIXME: We treat worker lost as green even though it is not to
# work around the Qts bot being on a broken internet connection.
# The real fix is https://bugs.webkit.org/show_bug.cgi?id=37099
builder['is_green'] = not re.search('fail', string_utils.decode(cell.renderContents(), target_type=str)) or \
Modified: trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/common/net/buildbot/buildbot_unittest.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -180,7 +180,7 @@
<td align="center" class="Activity idle">idle<br />3 pending</td>
<tr>
<td class="box"><a href="" Windows 32-bit Debug</a></td>
- <td align="center" class="LastBuild box failure"><a href="" />failed<br />failed<br />slave<br />lost</td>
+ <td align="center" class="LastBuild box failure"><a href="" />failed<br />failed<br />worker<br />lost</td>
<td align="center" class="Activity building">building<br />ETA in<br />~ 5 mins<br />at 08:25</td>
</table>
'''
Modified: trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/common/net/resultsjsonparser_unittest.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -62,7 +62,7 @@
"actual": "LEAK",
"leaks": [
{
- "document": "file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html"
+ "document": "file:///Volumes/Data/worker/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html"
}
]
}
@@ -81,7 +81,7 @@
"interrupted": true,
"skipped": 450,
"num_regressions": 15,
- "layout_tests_dir": "\/b\/build\/slave\/Webkit_Mac10_5\/build\/src\/third_party\/WebKit\/LayoutTests",
+ "layout_tests_dir": "\/b\/build\/worker\/Webkit_Mac10_5\/build\/src\/third_party\/WebKit\/LayoutTests",
"version": 3,
"num_passes": 77,
"has_pretty_patch": false,
@@ -115,7 +115,7 @@
"actual": "LEAK",
"leaks": [
{
- "document": "file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html"
+ "document": "file:///Volumes/Data/worker/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html"
}
]
}
@@ -134,7 +134,7 @@
"interrupted": false,
"skipped": 450,
"num_regressions": 15,
- "layout_tests_dir": "\/b\/build\/slave\/Webkit_Mac10_5\/build\/src\/third_party\/WebKit\/LayoutTests",
+ "layout_tests_dir": "\/b\/build\/worker\/Webkit_Mac10_5\/build\/src\/third_party\/WebKit\/LayoutTests",
"version": 3,
"num_passes": 77,
"has_pretty_patch": false,
@@ -148,7 +148,7 @@
expected_results = [
test_results.TestResult("svg/dynamic-updates/SVGFEDropShadowElement-dom-stdDeviation-attr.html", [test_failures.FailureImageHashMismatch()], 0),
test_results.TestResult("fast/dom/prototype-inheritance.html", [test_failures.FailureTextMismatch(), test_failures.FailureImageHashMismatch(), test_failures.FailureAudioMismatch()], 0),
- test_results.TestResult("fast/dom/prototype-strawberry.html", [test_failures.FailureDocumentLeak(['file:///Volumes/Data/slave/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html'])], 0),
+ test_results.TestResult("fast/dom/prototype-strawberry.html", [test_failures.FailureDocumentLeak(['file:///Volumes/Data/worker/webkit/build/LayoutTests/fast/dom/prototype-strawberry.html'])], 0),
]
expected_results.sort(key=lambda result: result.test_name)
parsed_results = ParsedJSONResults(self._example_full_results_json)
Modified: trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/common/system/crashlogs_unittest.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -37,7 +37,7 @@
def make_mock_crash_report_darwin(process_name, pid):
return """Crash log may not start with Process line
Process: {process_name} [{pid}]
-Path: /Volumes/Data/slave/snowleopard-intel-release-tests/build/WebKitBuild/Release/{process_name}
+Path: /Volumes/Data/worker/snowleopard-intel-release-tests/build/WebKitBuild/Release/{process_name}
Identifier: {process_name}
Version: ??? (???)
Code Type: X86-64 (Native)
@@ -58,7 +58,7 @@
Dyld Error Message:
Library not loaded: /Volumes/Data/WebKit-BuildSlave/snowleopard-intel-release/build/WebKitBuild/Release/WebCore.framework/Versions/A/WebCore
- Referenced from: /Volumes/Data/slave/snowleopard-intel-release/build/WebKitBuild/Release/WebKit.framework/Versions/A/WebKit
+ Referenced from: /Volumes/Data/worker/snowleopard-intel-release/build/WebKitBuild/Release/WebKit.framework/Versions/A/WebKit
Reason: image not found
Binary Images:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -162,7 +162,7 @@
if self._options.run_chunk:
chunk_len = test_size
# In this case chunk_num can be really large. We need
- # to make the slave fit in the current number of tests.
+ # to make the worker fit in the current number of tests.
slice_start = (chunk_num * chunk_len) % num_tests
else:
# Validate the data.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -575,8 +575,8 @@
master_name = self._options.master_name
builder_name = self._options.builder_name
build_number = self._options.build_number
- build_slave = self._options.build_slave
- if not master_name or not builder_name or not build_number or not build_slave:
+ build_worker = self._options.build_slave
+ if not master_name or not builder_name or not build_number or not build_worker:
_log.error("--results-server-host was set, but --master-name, --builder-name, --build-number, or --build-slave was not. Not uploading JSON files.")
return
@@ -588,13 +588,13 @@
revisions[name] = {'revision': revision, 'timestamp': scm.timestamp_of_native_revision(path, revision)}
for hostname in self._options.results_server_host:
- _log.info("Uploading JSON files for master: %s builder: %s build: %s slave: %s to %s", master_name, builder_name, build_number, build_slave, hostname)
+ _log.info("Uploading JSON files for master: {} builder: {} build: {} worker: {} to {}".format(master_name, builder_name, build_number, build_worker, hostname))
attrs = [
('master', 'build.webkit.org' if master_name == 'webkit.org' else master_name), # FIXME: Pass in build.webkit.org.
('builder_name', builder_name),
('build_number', build_number),
- ('build_slave', build_slave),
+ ('build_slave', build_worker),
('revisions', json.dumps(revisions)),
('start_time', str(start_time)),
('end_time', str(end_time)),
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -314,7 +314,7 @@
def generate_times_ms_file(self):
# FIXME: rename to generate_times_ms_file. This needs to be coordinated with
- # changing the calls to this on the chromium build slaves.
+ # changing the calls to this on the chromium build workers.
times = test_timings_trie(self._port, self._test_results_map.values())
file_path = self._filesystem.join(self._results_directory, self.TIMES_MS_FILENAME)
write_json(self._filesystem, times, file_path)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -348,7 +348,7 @@
optparse.make_option("--build-name", default="DUMMY_BUILD_NAME",
help=("The name of the builder used in its path, e.g. webkit-rel.")),
optparse.make_option("--build-slave", default="DUMMY_BUILD_SLAVE",
- help=("The name of the buildslave used. e.g. apple-macpro-6.")),
+ help=("The name of the worker used. e.g. apple-macpro-6.")),
optparse.make_option("--test-results-server", action="" default=[],
help=("If specified, upload results json files to this appengine server.")),
optparse.make_option("--results-server-host", action="" default=[],
Modified: trunk/Tools/Scripts/webkitpy/port/leakdetector_unittest.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/port/leakdetector_unittest.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/port/leakdetector_unittest.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -109,8 +109,8 @@
Binary Images:
- 0x107ac2000 - 0x107b4aff7 +DumpRenderTree (??? - ???) <5694BE03-A60A-30B2-9D40-27CFFCFB88EE> /Volumes/Data/WebKit-BuildSlave/lion-intel-leaks/build/WebKitBuild/Debug/DumpRenderTree
- 0x107c2f000 - 0x107c58fff +libWebCoreTestSupport.dylib (535.8.0 - compatibility 1.0.0) <E4F7A13E-5807-30F7-A399-62F8395F9106> /Volumes/Data/WebKit-BuildSlave/lion-intel-leaks/build/WebKitBuild/Debug/libWebCoreTestSupport.dylib
+ 0x107ac2000 - 0x107b4aff7 +DumpRenderTree (??? - ???) <5694BE03-A60A-30B2-9D40-27CFFCFB88EE> /Volumes/Data/worker/lion-intel-leaks/build/WebKitBuild/Debug/DumpRenderTree
+ 0x107c2f000 - 0x107c58fff +libWebCoreTestSupport.dylib (535.8.0 - compatibility 1.0.0) <E4F7A13E-5807-30F7-A399-62F8395F9106> /Volumes/Data/worker/lion-intel-leaks/build/WebKitBuild/Debug/libWebCoreTestSupport.dylib
17 leaks excluded (not printed)
"""
Modified: trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker_unittest.py (268924 => 268925)
--- trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker_unittest.py 2020-10-23 14:40:16 UTC (rev 268924)
+++ trunk/Tools/Scripts/webkitpy/style/checkers/jsonchecker_unittest.py 2020-10-23 16:13:28 UTC (rev 268925)
@@ -86,7 +86,7 @@
self.assert_error(1 if sys.version_info > (3, 0) else 0, 'json/syntax', '<<<<<<< HEAD\n{\n}\n')
def test_single_quote(self):
- self.assert_error(2, 'json/syntax', "{\n'slaves': []\n}\n")
+ self.assert_error(2, 'json/syntax', "{\n'workers': []\n}\n")
def test_init(self):
error_handler = MockErrorHandler(self.mock_handle_style_error)
@@ -95,13 +95,13 @@
def test_no_error(self):
self.assert_no_error("""{
- "slaves": [ { "name": "test-slave", "platform": "*" },
+ "workers": [ { "name": "test-worker", "platform": "*" },
{ "name": "apple-xserve-4", "platform": "mac-snowleopard" }
],
"builders": [ { "name": "SnowLeopard Intel Release (Build)", "type": "Build", "builddir": "snowleopard-intel-release",
"platform": "mac-snowleopard", "configuration": "release", "architectures": ["x86_64"],
- "slavenames": ["apple-xserve-4"]
+ "workernames": ["apple-xserve-4"]
}
],
