| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 DEPS = [ | 5 DEPS = [ |
| 6 'adb', | 6 'adb', |
| 7 'amp', | 7 'amp', |
| 8 'bisect_tester', | 8 'bisect_tester', |
| 9 'depot_tools/bot_update', | 9 'depot_tools/bot_update', |
| 10 'chromium', | 10 'chromium', |
| (...skipping 725 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 736 'another_apk', | 736 'another_apk', |
| 737 'omg_so_many_apks', | 737 'omg_so_many_apks', |
| 738 ] | 738 ] |
| 739 } | 739 } |
| 740 ], | 740 ], |
| 741 }, | 741 }, |
| 742 })) | 742 })) |
| 743 ) | 743 ) |
| 744 | 744 |
| 745 yield ( | 745 yield ( |
| 746 api.test('dynamic_instrumentation_test_with_timeout_scale') + |
| 747 api.properties.generic(mastername='chromium.android', |
| 748 buildername='Lollipop Low-end Tester', |
| 749 parent_buildername='Android arm Builder (dbg)') + |
| 750 api.override_step_data('read test spec', api.json.output({ |
| 751 'Lollipop Low-end Tester': { |
| 752 'instrumentation_tests': [ |
| 753 { |
| 754 'test': 'ChromePublicTest', |
| 755 'timeout_scale': 2, |
| 756 } |
| 757 ], |
| 758 }, |
| 759 })) |
| 760 ) |
| 761 |
| 762 yield ( |
| 746 api.test('dynamic_junit_test') + | 763 api.test('dynamic_junit_test') + |
| 747 api.properties.generic(mastername='chromium.linux', | 764 api.properties.generic(mastername='chromium.linux', |
| 748 buildername='Android Tests', | 765 buildername='Android Tests', |
| 749 parent_buildername='Android Builder') + | 766 parent_buildername='Android Builder') + |
| 750 api.override_step_data('read test spec', api.json.output({ | 767 api.override_step_data('read test spec', api.json.output({ |
| 751 'Android Tests': { | 768 'Android Tests': { |
| 752 'junit_tests': [ | 769 'junit_tests': [ |
| 753 { | 770 { |
| 754 'test': 'base_junit_tests', | 771 'test': 'base_junit_tests', |
| 755 }, | 772 }, |
| (...skipping 315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1071 | 1088 |
| 1072 yield ( | 1089 yield ( |
| 1073 api.test('kitchen_path_config') + | 1090 api.test('kitchen_path_config') + |
| 1074 api.properties( | 1091 api.properties( |
| 1075 mastername='chromium.fyi', | 1092 mastername='chromium.fyi', |
| 1076 buildername='Linux Kitchen (kitchen_run)', | 1093 buildername='Linux Kitchen (kitchen_run)', |
| 1077 slavename='build1-a1', | 1094 slavename='build1-a1', |
| 1078 buildnumber='77457', | 1095 buildnumber='77457', |
| 1079 path_config='kitchen') | 1096 path_config='kitchen') |
| 1080 ) | 1097 ) |
| OLD | NEW |