| Index: scripts/slave/recipe_modules/chromium_android/api.py
|
| diff --git a/scripts/slave/recipe_modules/chromium_android/api.py b/scripts/slave/recipe_modules/chromium_android/api.py
|
| index c9fcc279f3ef2bf28a19835d32587fe246832262..daef36e42a659221cc6ca18db3894909b482e592 100644
|
| --- a/scripts/slave/recipe_modules/chromium_android/api.py
|
| +++ b/scripts/slave/recipe_modules/chromium_android/api.py
|
| @@ -22,7 +22,8 @@ class AndroidApi(recipe_api.RecipeApi):
|
| super(AndroidApi, self).__init__(**kwargs)
|
| self._devices = None
|
| self._file_changes_path = None
|
| -
|
| + self.test_device = None
|
| +
|
| def get_config_defaults(self):
|
| return {
|
| 'REVISION': self.m.properties.get('revision', ''),
|
| @@ -1006,7 +1007,7 @@ class AndroidApi(recipe_api.RecipeApi):
|
| "android.webkit.cts.ExampleBlacklistedTest":
|
| [
|
| {
|
| - "name": "testA",
|
| + "name": "testA",
|
| "_bug_id": "crbug.com/123"
|
| },
|
| {"name": "testB"}
|
| @@ -1014,7 +1015,7 @@ class AndroidApi(recipe_api.RecipeApi):
|
| }'''
|
| )
|
| expected_failure = self.m.json.loads(expected_failure_json)
|
| -
|
| +
|
| cts_base_dir = self.m.path['build'].join('site_config', 'cts')
|
| cts_zip_path = cts_base_dir.join(_cts_file_name)
|
| cts_extract_dir = cts_base_dir.join('unzipped')
|
| @@ -1072,8 +1073,8 @@ class AndroidApi(recipe_api.RecipeApi):
|
| if test_method.get('result') == 'notExecuted':
|
| not_executed_tests.append(method_name)
|
| elif (test_method.find('./FailedScene') is not None and
|
| - test_method.get('name') not in
|
| - [ t.get('name') for t in
|
| + test_method.get('name') not in
|
| + [ t.get('name') for t in
|
| expected_failure.get(class_name, []) ]):
|
| unexpected_test_failures.append(method_name)
|
|
|
|
|