- Revision
- 129700
- Author
- [email protected]
- Date
- 2012-09-26 13:51:32 -0700 (Wed, 26 Sep 2012)
Log Message
Remove deprecated code from perftestrunner.py
https://bugs.webkit.org/show_bug.cgi?id=97724
Reviewed by Adam Barth.
Remove the code deprecated in r129580 now that we have landed r129597,
which updated master.cfg to use new options, and restarted the buildbot master.
* Scripts/webkitpy/performance_tests/perftestsrunner.py:
(PerfTestsRunner._parse_args):
(PerfTestsRunner._generate_and_show_results):
* Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
(test_run_with_slave_config_json):
(test_parse_args):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (129699 => 129700)
--- trunk/Tools/ChangeLog 2012-09-26 20:45:55 UTC (rev 129699)
+++ trunk/Tools/ChangeLog 2012-09-26 20:51:32 UTC (rev 129700)
@@ -1,3 +1,20 @@
+2012-09-26 Ryosuke Niwa <[email protected]>
+
+ Remove deprecated code from perftestrunner.py
+ https://bugs.webkit.org/show_bug.cgi?id=97724
+
+ Reviewed by Adam Barth.
+
+ Remove the code deprecated in r129580 now that we have landed r129597,
+ which updated master.cfg to use new options, and restarted the buildbot master.
+
+ * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+ (PerfTestsRunner._parse_args):
+ (PerfTestsRunner._generate_and_show_results):
+ * Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py:
+ (test_run_with_slave_config_json):
+ (test_parse_args):
+
2012-09-26 Beth Dakin <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=97629
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (129699 => 129700)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2012-09-26 20:45:55 UTC (rev 129699)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2012-09-26 20:51:32 UTC (rev 129700)
@@ -104,9 +104,6 @@
help="Clears the content in the generated JSON file before adding the results."),
optparse.make_option("--slave-config-json-path", action='', callback=_expand_path, type="str",
help="Only used on bots. Path to a slave configuration file."),
- optparse.make_option("--source-json-path", action='', callback=_expand_path, type="str", dest="slave_config_json_path",
- # FIXME: Remove this option once build.webkit.org is updated to use --slave-config-json-path.
- help="Deprecated. Overrides --slave-config-json-path."),
optparse.make_option("--description",
help="Add a description to the output JSON file if one is generated"),
optparse.make_option("--no-show-results", action="" default=True, dest="show_results",
@@ -181,11 +178,6 @@
def _generate_and_show_results(self):
options = self._options
- if options.test_results_server:
- # Remove this code once build.webkit.org started using --no-show-results and --reset-results
- options.reset_results = True
- options.show_results = False
-
output_json_path = self._output_json_path()
output = self._generate_results_dict(self._timestamp, options.description, options.platform, options.builder_name, options.build_number)
Modified: trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py (129699 => 129700)
--- trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py 2012-09-26 20:45:55 UTC (rev 129699)
+++ trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py 2012-09-26 20:51:32 UTC (rev 129700)
@@ -473,7 +473,7 @@
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',
- '--source-json-path=/mock-checkout/slave-config.json', '--test-results-server=some.host'])
+ '--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"}')
self._test_run_with_json_output(runner, port.host.filesystem, upload_suceeds=True)
self.assertEqual(runner.load_output_json(), [{
@@ -625,8 +625,10 @@
'--builder-name', 'webkit-mac-1',
'--build-number=56',
'--time-out-ms=42',
+ '--no-show-results',
+ '--reset-results',
'--output-json-path=a/output.json',
- '--source-json-path=a/source.json',
+ '--slave-config-json-path=a/source.json',
'--test-results-server=somehost',
'--debug'])
self.assertEqual(options.build, True)
@@ -636,6 +638,8 @@
self.assertEqual(options.build_number, '56')
self.assertEqual(options.time_out_ms, '42')
self.assertEqual(options.configuration, 'Debug')
+ self.assertEqual(options.show_results, False)
+ self.assertEqual(options.reset_results, True)
self.assertEqual(options.output_json_path, 'a/output.json')
self.assertEqual(options.slave_config_json_path, 'a/source.json')
self.assertEqual(options.test_results_server, 'somehost')
