| OLD | NEW |
| 1 | 1 |
| 2 DEPS = [ | 2 DEPS = [ |
| 3 'amp', | 3 'amp', |
| 4 'recipe_engine/json', | 4 'recipe_engine/json', |
| 5 'recipe_engine/path', | 5 'recipe_engine/path', |
| 6 'recipe_engine/properties', | 6 'recipe_engine/properties', |
| 7 ] | 7 ] |
| 8 | 8 |
| 9 BUILDERS = { | 9 BUILDERS = { |
| 10 'normal_example': { | 10 'normal_example': { |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 'api_protocol': 'http', | 71 'api_protocol': 'http', |
| 72 }, | 72 }, |
| 73 'network_config_set': { | 73 'network_config_set': { |
| 74 'device_name': ['SampleDevice'], | 74 'device_name': ['SampleDevice'], |
| 75 'device_os': ['SampleDeviceOS'], | 75 'device_os': ['SampleDeviceOS'], |
| 76 'api_address': '127.0.0.1', | 76 'api_address': '127.0.0.1', |
| 77 'api_port': '80', | 77 'api_port': '80', |
| 78 'api_protocol': 'http', | 78 'api_protocol': 'http', |
| 79 'network_config': 8, # Sprint 4G 1 Bar | 79 'network_config': 8, # Sprint 4G 1 Bar |
| 80 }, | 80 }, |
| 81 'slow_tests': { |
| 82 'device_name': ['SampleDevice'], |
| 83 'device_os': ['SampleDeviceOS'], |
| 84 'api_address': '127.0.0.1', |
| 85 'api_port': '80', |
| 86 'api_protocol': 'http', |
| 87 'timeout_scale': 10, |
| 88 'test_run_timeout': 3600, |
| 89 }, |
| 81 } | 90 } |
| 82 | 91 |
| 83 AMP_RESULTS_BUCKET = 'chrome-amp-results' | 92 AMP_RESULTS_BUCKET = 'chrome-amp-results' |
| 84 | 93 |
| 85 from recipe_engine.recipe_api import Property | 94 from recipe_engine.recipe_api import Property |
| 86 | 95 |
| 87 PROPERTIES = { | 96 PROPERTIES = { |
| 88 'buildername': Property(), | 97 'buildername': Property(), |
| 89 } | 98 } |
| 90 | 99 |
| (...skipping 18 matching lines...) Expand all Loading... |
| 109 api_protocol=builder.get('api_protocol', None), | 118 api_protocol=builder.get('api_protocol', None), |
| 110 network_config=builder.get('network_config', None))) | 119 network_config=builder.get('network_config', None))) |
| 111 | 120 |
| 112 instrumentation_test_id = api.amp.trigger_test_suite( | 121 instrumentation_test_id = api.amp.trigger_test_suite( |
| 113 'example_instrumentation_suite', 'instrumentation', | 122 'example_instrumentation_suite', 'instrumentation', |
| 114 api.amp.instrumentation_test_arguments( | 123 api.amp.instrumentation_test_arguments( |
| 115 apk_under_test='ApkUnderTest.apk', | 124 apk_under_test='ApkUnderTest.apk', |
| 116 test_apk='TestApk.apk', | 125 test_apk='TestApk.apk', |
| 117 additional_apks=['ExtraApk1.apk', 'ExtraApk2.apk'], | 126 additional_apks=['ExtraApk1.apk', 'ExtraApk2.apk'], |
| 118 isolate_file_path='isolate_file.isolate', | 127 isolate_file_path='isolate_file.isolate', |
| 119 annotation='SmallTest'), | 128 annotation='SmallTest', |
| 129 timeout_scale=builder.get('timeout_scale')), |
| 120 api.amp.amp_arguments( | 130 api.amp.amp_arguments( |
| 121 device_minimum_os=builder.get('device_minimum_os', None), | 131 device_minimum_os=builder.get('device_minimum_os', None), |
| 122 device_name=builder.get('device_name', None), | 132 device_name=builder.get('device_name', None), |
| 123 device_oem=builder.get('device_oem', None), | 133 device_oem=builder.get('device_oem', None), |
| 124 device_os=builder.get('device_os', None), | 134 device_os=builder.get('device_os', None), |
| 125 device_timeout=builder.get('device_timeout', None), | 135 device_timeout=builder.get('device_timeout', None), |
| 126 api_address=builder.get('api_address', None), | 136 api_address=builder.get('api_address', None), |
| 127 api_port=builder.get('api_port', None), | 137 api_port=builder.get('api_port', None), |
| 128 api_protocol=builder.get('api_protocol', None), | 138 api_protocol=builder.get('api_protocol', None), |
| 129 network_config=builder.get('network_config', None))) | 139 network_config=builder.get('network_config', None), |
| 140 test_run_timeout=builder.get('test_run_timeout'))) |
| 130 | 141 |
| 131 uirobot_test_id = api.amp.trigger_test_suite( | 142 uirobot_test_id = api.amp.trigger_test_suite( |
| 132 'example_uirobot_suite', 'uirobot', | 143 'example_uirobot_suite', 'uirobot', |
| 133 api.amp.uirobot_arguments(app_under_test='Example.apk'), | 144 api.amp.uirobot_arguments(app_under_test='Example.apk'), |
| 134 api.amp.amp_arguments( | 145 api.amp.amp_arguments( |
| 135 device_minimum_os=builder.get('device_minimum_os', None), | 146 device_minimum_os=builder.get('device_minimum_os', None), |
| 136 device_name=builder.get('device_name', None), | 147 device_name=builder.get('device_name', None), |
| 137 device_oem=builder.get('device_oem', None), | 148 device_oem=builder.get('device_oem', None), |
| 138 device_os=builder.get('device_os', None), | 149 device_os=builder.get('device_os', None), |
| 139 device_timeout=builder.get('device_timeout', None), | 150 device_timeout=builder.get('device_timeout', None), |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 api.test('bad_device_data_for_collect') + | 207 api.test('bad_device_data_for_collect') + |
| 197 api.properties.generic(buildername='split_example') + | 208 api.properties.generic(buildername='split_example') + |
| 198 api.override_step_data('[collect] load example_gtest_suite', | 209 api.override_step_data('[collect] load example_gtest_suite', |
| 199 api.json.output({}))) | 210 api.json.output({}))) |
| 200 | 211 |
| 201 yield ( | 212 yield ( |
| 202 api.test('bad_test_id_data_for_upload') + | 213 api.test('bad_test_id_data_for_upload') + |
| 203 api.properties.generic(buildername='split_example') + | 214 api.properties.generic(buildername='split_example') + |
| 204 api.override_step_data('[upload logcat] load example_gtest_suite data', | 215 api.override_step_data('[upload logcat] load example_gtest_suite data', |
| 205 api.json.output({}))) | 216 api.json.output({}))) |
| OLD | NEW |