Commit 0994ab58 authored by dsinclair's avatar dsinclair Committed by Commit bot

Revert of Telemetry: Fix exact_matches in telemetry.test_runner. (patchset #4...

Revert of Telemetry: Fix exact_matches in telemetry.test_runner. (patchset #4 id:60001 of https://codereview.chromium.org/560153004/)

Reason for revert:
Can't find the webrtc tests.

http://build.chromium.org/p/chromium.perf/builders/Win%207%20x64%20Perf%20%281%29/builds/2649

Original issue's description:
> Telemetry: Fix exact_matches in telemetry.test_runner.
>
> Previously, if exact_matches was True but there were no exact matches,
> it would return fuzzy matches instead. This is not what the caller asked
> for.
>
> GPU test names are changed to match the buildbot config, since they were
> previously relying on fuzzy matching.
>
> SHERIFFS: May cause errors like:
>
>   No test named "some_test_name".
>
>   Available tests are:
>     ...
>
> If so, this CL can be safely reverted.
>
> BUG=413334,413442
>
> Committed: https://crrev.com/566ed9f6e71cea313c88e8f259eca76581b72d67
> Cr-Commit-Position: refs/heads/master@{#294757}

TBR=nednguyen@google.com,ariblue@google.com,dtu@chromium.org,kbr@chromium.org,tonyg@chromium.org,jbroman@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=413334,413442

Review URL: https://codereview.chromium.org/555703005

Cr-Commit-Position: refs/heads/master@{#294812}
parent df474d8b
...@@ -36,12 +36,13 @@ class _GpuProcessValidator(page_test.PageTest): ...@@ -36,12 +36,13 @@ class _GpuProcessValidator(page_test.PageTest):
class GpuProcess(benchmark.Benchmark): class GpuProcess(benchmark.Benchmark):
"""Tests that accelerated content triggers the creation of a GPU process""" """Tests that accelerated content triggers the creation of a GPU process"""
test = _GpuProcessValidator test = _GpuProcessValidator
page_set = page_sets.GpuProcessTestsPageSet
def CreateExpectations(self, page_set): def CreateExpectations(self, page_set):
return expectations.GpuProcessExpectations() return expectations.GpuProcessExpectations()
def CreatePageSet(self, options): def CreatePageSet(self, options):
page_set = page_sets.GpuProcessTestsPageSet() page_set = super(GpuProcess, self).CreatePageSet(options)
for page in page_set.pages: for page in page_set.pages:
page.script_to_evaluate_on_commit = test_harness_script page.script_to_evaluate_on_commit = test_harness_script
return page_set return page_set
...@@ -65,9 +65,10 @@ class _GpuRasterizationValidator(cloud_storage_test_base.ValidatorBase): ...@@ -65,9 +65,10 @@ class _GpuRasterizationValidator(cloud_storage_test_base.ValidatorBase):
class GpuRasterization(cloud_storage_test_base.TestBase): class GpuRasterization(cloud_storage_test_base.TestBase):
"""Tests that GPU rasterization produces valid content""" """Tests that GPU rasterization produces valid content"""
test = _GpuRasterizationValidator test = _GpuRasterizationValidator
page_set = page_sets.GpuRasterizationTestsPageSet
def CreatePageSet(self, options): def CreatePageSet(self, options):
page_set = page_sets.GpuRasterizationTestsPageSet() page_set = super(GpuRasterization, self).CreatePageSet(options)
for page in page_set.pages: for page in page_set.pages:
page.script_to_evaluate_on_commit = test_harness_script page.script_to_evaluate_on_commit = test_harness_script
return page_set return page_set
# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import memory_test_expectations import memory_expectations
import page_sets import page_sets
from telemetry import benchmark from telemetry import benchmark
...@@ -99,15 +99,16 @@ class _MemoryValidator(page_test.PageTest): ...@@ -99,15 +99,16 @@ class _MemoryValidator(page_test.PageTest):
return 'Memory allocation too %s (was %d MB, should be %d MB +/- %d MB)' % ( return 'Memory allocation too %s (was %d MB, should be %d MB +/- %d MB)' % (
low_or_high, mb_used, SINGLE_TAB_LIMIT_MB, WIGGLE_ROOM_MB) low_or_high, mb_used, SINGLE_TAB_LIMIT_MB, WIGGLE_ROOM_MB)
class MemoryTest(benchmark.Benchmark): class Memory(benchmark.Benchmark):
"""Tests GPU memory limits""" """Tests GPU memory limits"""
test = _MemoryValidator test = _MemoryValidator
page_set = page_sets.MemoryTestsPageSet
def CreateExpectations(self, page_set): def CreateExpectations(self, page_set):
return memory_test_expectations.MemoryTestExpectations() return memory_expectations.MemoryExpectations()
def CreatePageSet(self, options): def CreatePageSet(self, options):
page_set = page_sets.MemoryTestsPageSet() page_set = super(Memory, self).CreatePageSet(options)
for page in page_set.pages: for page in page_set.pages:
page.script_to_evaluate_on_commit = test_harness_script page.script_to_evaluate_on_commit = test_harness_script
return page_set return page_set
...@@ -18,7 +18,7 @@ from telemetry.page import test_expectations ...@@ -18,7 +18,7 @@ from telemetry.page import test_expectations
# Examples: ('nvidia', 0x1234), ('arm', 'Mali-T604') # Examples: ('nvidia', 0x1234), ('arm', 'Mali-T604')
# Device IDs must be paired with a GPU vendor. # Device IDs must be paired with a GPU vendor.
class MemoryTestExpectations(test_expectations.TestExpectations): class MemoryExpectations(test_expectations.TestExpectations):
def SetExpectations(self): def SetExpectations(self):
# Sample Usage: # Sample Usage:
# self.Fail('Memory.CSS3D', # self.Fail('Memory.CSS3D',
......
...@@ -148,6 +148,7 @@ class _PixelValidator(cloud_storage_test_base.ValidatorBase): ...@@ -148,6 +148,7 @@ class _PixelValidator(cloud_storage_test_base.ValidatorBase):
class Pixel(cloud_storage_test_base.TestBase): class Pixel(cloud_storage_test_base.TestBase):
test = _PixelValidator test = _PixelValidator
page_set = page_sets.PixelTestsPageSet
@classmethod @classmethod
def AddTestCommandLineArgs(cls, group): def AddTestCommandLineArgs(cls, group):
...@@ -158,7 +159,7 @@ class Pixel(cloud_storage_test_base.TestBase): ...@@ -158,7 +159,7 @@ class Pixel(cloud_storage_test_base.TestBase):
default=default_reference_image_dir) default=default_reference_image_dir)
def CreatePageSet(self, options): def CreatePageSet(self, options):
page_set = page_sets.PixelTestsPageSet() page_set = super(Pixel, self).CreatePageSet(options)
for page in page_set.pages: for page in page_set.pages:
page.script_to_evaluate_on_commit = test_harness_script page.script_to_evaluate_on_commit = test_harness_script
return page_set return page_set
......
...@@ -246,7 +246,6 @@ def _MatchTestName(input_test_name, exact_matches=True): ...@@ -246,7 +246,6 @@ def _MatchTestName(input_test_name, exact_matches=True):
for test_class in _Tests(): for test_class in _Tests():
if exact_match == test_class.Name(): if exact_match == test_class.Name():
return [test_class] return [test_class]
return []
# Fuzzy matching. # Fuzzy matching.
return [test_class for test_class in _Tests() return [test_class for test_class in _Tests()
......
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