| Index: third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
|
| index 50ea557a90d2d3c0bd54304b74f1c9c71eaa9635..345cdbf708c85a29ee4523a0b528ea03cd4c2223 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/performance_tests/perftestsrunner_unittest.py
|
| @@ -694,8 +694,13 @@ class IntegrationTest(unittest.TestCase):
|
| "revisions": {"chromium": {"timestamp": "2013-02-01 08:48:05 +0000", "revision": "5678"}}}])
|
|
|
| def test_run_with_upload_json(self):
|
| - 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'])
|
| + 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'
|
| + ])
|
|
|
| self._test_run_with_json_output(runner, port.host.filesystem, upload_succeeds=True)
|
| generated_json = json.loads(port.host.filesystem.files['/mock-checkout/output.json'])
|
| @@ -707,9 +712,14 @@ class IntegrationTest(unittest.TestCase):
|
| expected_exit_code=PerfTestsRunner.EXIT_CODE_FAILED_UPLOADING)
|
|
|
| def test_run_with_upload_json_should_generate_perf_webkit_json(self):
|
| - 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'])
|
| + 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"}')
|
|
|
| self._test_run_with_json_output(runner, port.host.filesystem, upload_succeeds=True)
|
|
|