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 import contextlib | 5 import contextlib |
6 import datetime | 6 import datetime |
7 import json | 7 import json |
8 import os | 8 import os |
9 import re | 9 import re |
10 import urllib | 10 import urllib |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
108 s.managed = self.c.managed | 108 s.managed = self.c.managed |
109 s.revision = self.c.revision | 109 s.revision = self.c.revision |
110 spec.revisions = self.c.revisions | 110 spec.revisions = self.c.revisions |
111 | 111 |
112 self.m.gclient.break_locks() | 112 self.m.gclient.break_locks() |
113 refs = self.m.properties.get('event.patchSet.ref') | 113 refs = self.m.properties.get('event.patchSet.ref') |
114 if refs: | 114 if refs: |
115 refs = [refs] | 115 refs = [refs] |
116 result = self.m.bot_update.ensure_checkout( | 116 result = self.m.bot_update.ensure_checkout( |
117 spec, refs=refs, with_branch_heads=with_branch_heads) | 117 spec, refs=refs, with_branch_heads=with_branch_heads) |
118 if not result.json.output['did_run']: | |
119 result = self.m.gclient.checkout(spec, with_branch_heads=with_branch_heads ) | |
iannucci
2016/02/16 21:04:53
Did chromium_android use bot_update before? Or was
| |
120 | 118 |
121 # TODO(sivachandra): Manufacture gclient spec such that it contains "src" | 119 # TODO(sivachandra): Manufacture gclient spec such that it contains "src" |
122 # solution + repo_name solution. Then checkout will be automatically | 120 # solution + repo_name solution. Then checkout will be automatically |
123 # correctly set by gclient.checkout | 121 # correctly set by gclient.checkout |
124 self.m.path['checkout'] = self.m.path['slave_build'].join('src') | 122 self.m.path['checkout'] = self.m.path['slave_build'].join('src') |
125 | 123 |
126 self.clean_local_files() | 124 self.clean_local_files() |
127 | 125 |
128 return result | 126 return result |
129 | 127 |
(...skipping 1097 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1227 def test_runner(self, step_name, args=None, **kwargs): | 1225 def test_runner(self, step_name, args=None, **kwargs): |
1228 """Wrapper for the python testrunner script. | 1226 """Wrapper for the python testrunner script. |
1229 | 1227 |
1230 Args: | 1228 Args: |
1231 step_name: Name of the step. | 1229 step_name: Name of the step. |
1232 args: Testrunner arguments. | 1230 args: Testrunner arguments. |
1233 """ | 1231 """ |
1234 with self.handle_exit_codes(): | 1232 with self.handle_exit_codes(): |
1235 return self.m.python( | 1233 return self.m.python( |
1236 step_name, self.c.test_runner, args, **kwargs) | 1234 step_name, self.c.test_runner, args, **kwargs) |
OLD | NEW |