Changeset 268880 in webkit

Timestamp:

Oct 22, 2020, 11:51:09 AM (6 years ago)

Author:

aakash_jain@apple.com

Message:

[webkitpy] Rename slave to worker in perftestsrunner
​https://bugs.webkit.org/show_bug.cgi?id=218082

Reviewed by Ryosuke Niwa.

• Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._parse_args): Supporting both --slave-config-json-path and --worker-config-json-path for now.
(_generate_results):
(_merge_worker_config_json):
(_merge_slave_config_json): Deleted.

• Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:

(MainTest.test_parse_args):
(MainTest.test_parse_deprecated_args): Added unit-test for deprecated parameter.

• BuildSlaveSupport/build.webkit.org-config/steps.py:

(RunAndUploadPerfTests):

Location:

trunk/Tools

Files:

• BuildSlaveSupport/build.webkit.org-config/steps.py (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/performance_tests/perftestsrunner.py (modified) (3 diffs)
• Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py (modified) (3 diffs)
• Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (modified) (3 diffs)

trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py

@@ -938 +938 @@
     command = ["python", "./Tools/Scripts/run-perf-tests",
                "--output-json-path", "perf-test-results.json",
-               "--slave-config-json-path", "../../perf-test-config.json",
+               "--worker-config-json-path", "../../perf-test-config.json",
                "--no-show-results",
                "--reset-results",

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-22  Aakash Jain  <aakash_jain@apple.com>
+
+        [webkitpy] Rename slave to worker in perftestsrunner
+        https://bugs.webkit.org/show_bug.cgi?id=218082
+
+        Reviewed by Ryosuke Niwa.
+
+        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+        (PerfTestsRunner._parse_args): Supporting both --slave-config-json-path and --worker-config-json-path for now.
+        (_generate_results):
+        (_merge_worker_config_json):
+        (_merge_slave_config_json): Deleted.
+        * Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py:
+        * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+        (MainTest.test_parse_args):
+        (MainTest.test_parse_deprecated_args): Added unit-test for deprecated parameter.
+        * BuildSlaveSupport/build.webkit.org-config/steps.py:
+        (RunAndUploadPerfTests):
+
 2020-10-22  Jonathan Bedard  <jbedard@apple.com>
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

@@ -112 +112 @@
             optparse.make_option("--reset-results", action="store_true",
                 help="Clears the content in the generated JSON file before adding the results."),
-            optparse.make_option("--slave-config-json-path", action='callback', callback=_expand_path, type="str",
-                help="Only used on bots. Path to a slave configuration file."),
+            optparse.make_option("--slave-config-json-path", "--worker-config-json-path", action='callback',
+                callback=_expand_path, type="str", dest="worker_config_json_path",
+                help="Only used on bots. Path to a worker configuration file."),
             optparse.make_option("--description",
                 help="Add a description to the output JSON file if one is generated"),
@@ -247 +248 @@
         output = self._generate_results_dict(self._timestamp, options.description, options.platform, options.builder_name, options.build_number)
 
-        if options.slave_config_json_path:
-            output = self._merge_slave_config_json(options.slave_config_json_path, output)
+        if options.worker_config_json_path:
+            output = self._merge_worker_config_json(options.worker_config_json_path, output)
             if not output:
                 return self.EXIT_CODE_BAD_SOURCE_JSON
@@ -317 +318 @@
         return datetime.strftime('%Y-%m-%dT%H:%M:%S.%f')
 
-    def _merge_slave_config_json(self, slave_config_json_path, contents):
-        if not self._host.filesystem.isfile(slave_config_json_path):
-            _log.error("Missing slave configuration JSON file: %s" % slave_config_json_path)
+    def _merge_worker_config_json(self, worker_config_json_path, contents):
+        if not self._host.filesystem.isfile(worker_config_json_path):
+            _log.error('Missing worker configuration JSON file: {}'.format(worker_config_json_path))
             return None
 
         try:
-            slave_config_json = self._host.filesystem.open_text_file_for_reading(slave_config_json_path)
-            slave_config = json.load(slave_config_json)
-            for key in slave_config:
-                contents['builder' + key.capitalize()] = slave_config[key]
+            worker_config_json = self._host.filesystem.open_text_file_for_reading(worker_config_json_path)
+            worker_config = json.load(worker_config_json)
+            for key in worker_config:
+                contents['builder' + key.capitalize()] = worker_config[key]
             return contents
         except Exception as error:
-            _log.error("Failed to merge slave configuration JSON file %s: %s" % (slave_config_json_path, error))
+            _log.error('Failed to merge worker configuration JSON file {}: {}'.format(worker_config_json_path, error))
         return None
 

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_integrationtest.py

@@ -447 +447 @@
         self._test_run_with_json_output(runner, port.host.filesystem, expected_exit_code=PerfTestsRunner.EXIT_CODE_BAD_MERGE)
 
-    def test_run_with_slave_config_json(self):
-        runner, port = self.create_runner_and_setup_results_template(args=['--output-json-path=/mock-checkout/output.json',
-            '--slave-config-json-path=/mock-checkout/slave-config.json', '--test-results-server=some.host'])
-        port.host.filesystem.write_text_file('/mock-checkout/slave-config.json', '{"key": "value"}')
+    def test_run_with_worker_config_json(self):
+        runner, port = self.create_runner_and_setup_results_template(args=['--output-json-path=/mock-checkout/output.json',
+            '--worker-config-json-path=/mock-checkout/worker-config.json', '--test-results-server=some.host'])
+        port.host.filesystem.write_text_file('/mock-checkout/worker-config.json', '{"key": "value"}')
         self._test_run_with_json_output(runner, port.host.filesystem, upload_succeeds=True)
         self.assertEqual(self._load_output_json(runner), [{
@@ -456 +456 @@
             "revisions": {"WebKit": {"timestamp": "2013-02-01 08:48:05 +0000", "revision": "5678"}}, "builderKey": "value"}])
 
-    def test_run_with_bad_slave_config_json(self):
-        runner, port = self.create_runner_and_setup_results_template(args=['--output-json-path=/mock-checkout/output.json',
-            '--slave-config-json-path=/mock-checkout/slave-config.json', '--test-results-server=some.host'])
+    def test_run_with_bad_worker_config_json(self):
+        runner, port = self.create_runner_and_setup_results_template(args=['--output-json-path=/mock-checkout/output.json',
+            '--worker-config-json-path=/mock-checkout/worker-config.json', '--test-results-server=some.host'])
         logs = self._test_run_with_json_output(runner, port.host.filesystem, expected_exit_code=PerfTestsRunner.EXIT_CODE_BAD_SOURCE_JSON)
-        self.assertTrue('Missing slave configuration JSON file: /mock-checkout/slave-config.json' in logs)
-        port.host.filesystem.write_text_file('/mock-checkout/slave-config.json', 'bad json')
+        self.assertTrue('Missing worker configuration JSON file: /mock-checkout/worker-config.json' in logs)
+        port.host.filesystem.write_text_file('/mock-checkout/worker-config.json', 'bad json')
         self._test_run_with_json_output(runner, port.host.filesystem, expected_exit_code=PerfTestsRunner.EXIT_CODE_BAD_SOURCE_JSON)
-        port.host.filesystem.write_text_file('/mock-checkout/slave-config.json', '["another bad json"]')
+        port.host.filesystem.write_text_file('/mock-checkout/worker-config.json', '["another bad json"]')
         self._test_run_with_json_output(runner, port.host.filesystem, expected_exit_code=PerfTestsRunner.EXIT_CODE_BAD_SOURCE_JSON)
 
@@ -491 +491 @@
         runner, port = self.create_runner_and_setup_results_template(args=['--output-json-path=/mock-checkout/output.json',
             '--test-results-server', 'some.host', '--platform', 'platform1', '--builder-name', 'builder1', '--build-number', '123',
-            '--slave-config-json-path=/mock-checkout/slave-config.json'])
-        port.host.filesystem.write_text_file('/mock-checkout/slave-config.json', '{"key": "value1"}')
+            '--worker-config-json-path=/mock-checkout/worker-config.json'])
+        port.host.filesystem.write_text_file('/mock-checkout/worker-config.json', '{"key": "value1"}')
 
         self._test_run_with_json_output(runner, port.host.filesystem, upload_succeeds=True)

trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py

@@ -150 +150 @@
                 '--reset-results',
                 '--output-json-path=a/output.json',
-                '--slave-config-json-path=a/source.json',
+                '--worker-config-json-path=a/source.json',
                 '--test-results-server=somehost',
                 '--additional-drt-flag=--enable-threaded-parser',
@@ -168 +168 @@
         self.assertTrue(options.reset_results)
         self.assertEqual(options.output_json_path, 'a/output.json')
-        self.assertEqual(options.slave_config_json_path, 'a/source.json')
+        self.assertEqual(options.worker_config_json_path, 'a/source.json')
         self.assertEqual(options.test_results_server, 'somehost')
         self.assertEqual(options.additional_drt_flag, ['--enable-threaded-parser', '--awesomesauce'])
@@ -174 +174 @@
         self.assertEqual(options.test_runner_count, 5)
         self.assertEqual(options.no_timeout, True)
+
+    def test_parse_deprecated_args(self):
+        # FIXME: remove this test and the corresponding parameter after all instances of this deprecated parameter have been removed
+        options, _ = PerfTestsRunner._parse_args(['--slave-config-json-path=a/source1.json'])
+        self.assertEqual(options.worker_config_json_path, 'a/source1.json')
 
     def test_upload_json(self):