diff options
| author |  Eric Boren <borenet@google.com> | 2017-06-28 13:50:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-28 18:46:16 +0000 |
| commit | 89cd35795f7cc3042084fb14fec27102c6e67f2c (patch) | |
| tree | 94c732f308d4bc2e64e9c4226cdf5fbbf53378c6 /infra/bots/recipe_modules/vars | |
| parent | a4f792da37eada1dcc05c50b152e20ac36a0977c (diff) | |
Fix recipes/tests for new Debian bots
Bug: skia:6612
Change-Id: I2920bb7b1aa3ebb021223ed6345f13f1f9c8bc24
Reviewed-on: https://skia-review.googlesource.com/21141
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipe_modules/vars')
| -rw-r--r-- | infra/bots/recipe_modules/vars/api.py | 4 | ||||
| -rw-r--r-- | infra/bots/recipe_modules/vars/examples/full.py | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/infra/bots/recipe_modules/vars/api.py b/infra/bots/recipe_modules/vars/api.py index 2c23f7af85..da11651802 100644 --- a/infra/bots/recipe_modules/vars/api.py +++ b/infra/bots/recipe_modules/vars/api.py @@ -143,6 +143,10 @@ class SkiaVarsApi(recipe_api.RecipeApi): self.chromeos_homedir = '/home/chronos/user/' @property + def is_linux(self): + return 'Ubuntu' in self.builder_name or 'Debian' in self.builder_name + + @property def upload_dm_results(self): # TODO(borenet): Move this into the swarm_test recipe. skip_upload_bots = [ diff --git a/infra/bots/recipe_modules/vars/examples/full.py b/infra/bots/recipe_modules/vars/examples/full.py index be15b063a8..eeddfd72f7 100644 --- a/infra/bots/recipe_modules/vars/examples/full.py +++ b/infra/bots/recipe_modules/vars/examples/full.py @@ -17,7 +17,8 @@ def RunSteps(api): api.vars.swarming_bot_id, api.vars.swarming_task_id, ] - assert len(info) == 4 # Make pylint happy. + if api.vars.is_linux: + assert len(info) == 4 # Make pylint happy. TEST_BUILDERS = [ |