Commit 91d73d51 authored by Achuith Bhandarkar's avatar Achuith Bhandarkar Committed by Commit Bot

variations uses osname chromeos, not cros.

Bug=chromium:871600

Cq-Include-Trybots: master.tryserver.chromium.perf:obbs_fyi
Change-Id: I09f909050620f8d2e2e9a1fdedbe2c7091732128
Reviewed-on: https://chromium-review.googlesource.com/1173138Reviewed-by: default avatarMichael Giuffrida <michaelpg@chromium.org>
Reviewed-by: default avatarNed Nguyen <nednguyen@google.com>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#582865}
parent 3939b423
...@@ -113,6 +113,8 @@ class PerfBenchmark(benchmark.Benchmark): ...@@ -113,6 +113,8 @@ class PerfBenchmark(benchmark.Benchmark):
return 'windows' return 'windows'
if target_os.startswith('linux'): if target_os.startswith('linux'):
return 'linux' return 'linux'
if target_os == 'cros':
return 'chromeos'
return target_os return target_os
def _GetVariationsBrowserArgs(self, finder_options): def _GetVariationsBrowserArgs(self, finder_options):
......
...@@ -8,7 +8,6 @@ import shutil ...@@ -8,7 +8,6 @@ import shutil
import tempfile import tempfile
import unittest import unittest
from telemetry import decorators
from telemetry.internal.browser import browser_finder from telemetry.internal.browser import browser_finder
from telemetry.testing import options_for_unittests from telemetry.testing import options_for_unittests
...@@ -35,7 +34,6 @@ class PerfBenchmarkTest(unittest.TestCase): ...@@ -35,7 +34,6 @@ class PerfBenchmarkTest(unittest.TestCase):
self.assertEqual(num_expected_matches, len(ruleset_data_to_copy)) self.assertEqual(num_expected_matches, len(ruleset_data_to_copy))
@decorators.Disabled('chromeos') # crbug.com/871600.
def testVariationArgs(self): def testVariationArgs(self):
benchmark = perf_benchmark.PerfBenchmark() benchmark = perf_benchmark.PerfBenchmark()
options = options_for_unittests.GetCopy() options = options_for_unittests.GetCopy()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment