| Index: scripts/slave/recipes/android_webview_aosp.py
|
| diff --git a/scripts/slave/recipes/android_webview_aosp.py b/scripts/slave/recipes/android_webview_aosp.py
|
| index ee0fe50e310c537e0194a392284f4c3d4c93370f..602ffdaae3519b91364b2de1babf23926a66acd5 100644
|
| --- a/scripts/slave/recipes/android_webview_aosp.py
|
| +++ b/scripts/slave/recipes/android_webview_aosp.py
|
| @@ -27,28 +27,12 @@ def GenSteps(api):
|
| use_goma=True)
|
|
|
| def GenTests(api):
|
| - def _common_step_mocks():
|
| - return {
|
| - 'calculate trimmed deps': {
|
| - 'json': {
|
| - 'output': {
|
| - 'blacklist': {
|
| - 'src/blacklist/project/1': None,
|
| - 'src/blacklist/project/2': None,
|
| - }
|
| - }
|
| - }
|
| - }
|
| - }
|
| -
|
| yield 'basic', {
|
| - 'properties': api.properties_scheduled(),
|
| - 'step_mocks': _common_step_mocks(),
|
| + 'properties': api.properties.scheduled(),
|
| }
|
|
|
| yield 'uses_android_repo', {
|
| - 'properties': api.properties_scheduled(),
|
| - 'step_mocks': _common_step_mocks(),
|
| + 'properties': api.properties.scheduled(),
|
| 'mock' : {
|
| 'path': {
|
| 'exists': [
|
| @@ -59,8 +43,7 @@ def GenTests(api):
|
| }
|
|
|
| yield 'doesnt_sync_if_android_present', {
|
| - 'properties': api.properties_scheduled(),
|
| - 'step_mocks': _common_step_mocks(),
|
| + 'properties': api.properties.scheduled(),
|
| 'mock' : {
|
| 'path': {
|
| 'exists': [
|
| @@ -71,8 +54,7 @@ def GenTests(api):
|
| }
|
|
|
| yield 'does_delete_stale_chromium', {
|
| - 'properties': api.properties_scheduled(),
|
| - 'step_mocks': _common_step_mocks(),
|
| + 'properties': api.properties.scheduled(),
|
| 'mock' : {
|
| 'path': {
|
| 'exists': [
|
| @@ -83,8 +65,7 @@ def GenTests(api):
|
| }
|
|
|
| yield 'uses_goma_test', {
|
| - 'properties': api.properties_scheduled(),
|
| - 'step_mocks': _common_step_mocks(),
|
| + 'properties': api.properties.scheduled(),
|
| 'mock' : {
|
| 'path': {
|
| 'exists': [
|
| @@ -95,11 +76,9 @@ def GenTests(api):
|
| }
|
|
|
| yield 'works_if_revision_not_present', {
|
| - 'properties': api.properties_generic(),
|
| - 'step_mocks': _common_step_mocks(),
|
| + 'properties': api.properties.generic(),
|
| }
|
|
|
| yield 'trybot', {
|
| - 'properties': api.properties_tryserver(),
|
| - 'step_mocks': _common_step_mocks(),
|
| + 'properties': api.properties.tryserver(),
|
| }
|
|
|