Revert of [Telemetry] Enable the measurement smoke test on android....

Revert of [Telemetry] Enable the measurement smoke test on android. (https://codereview.chromium.org/250593003/)

Reason for revert:
[Sheriff] This is failing on android now (slightly after its activation, but I can't figure out the actual culprit):
http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/20079

Original issue's description:
> [Telemetry] Enable the measurement smoke test on android.
> 
> This required disabling the benchmarks that were causing it to fail. It looks
> like those failures were due to lack of tab support in ChromeShell.
> 
> BUG=337829
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=266457

TBR=bulach@chromium.org,tonyg@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=337829

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266511 0039d316-1c4b-4281-b951-d872f2087c98
parent 6ee9e90f
...@@ -2,11 +2,9 @@ ...@@ -2,11 +2,9 @@
# 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.
from measurements import memory_pressure
from telemetry import test from telemetry import test
from measurements import memory_pressure
@test.Disabled('android')
class MemoryPressure(test.Test): class MemoryPressure(test.Test):
test = memory_pressure.MemoryPressure test = memory_pressure.MemoryPressure
page_set = 'page_sets/typical_25.py' page_set = 'page_sets/typical_25.py'
......
...@@ -2,9 +2,10 @@ ...@@ -2,9 +2,10 @@
# 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.
from measurements import tab_switching
from telemetry import test from telemetry import test
from measurements import tab_switching
class TabSwitchingTop10(test.Test): class TabSwitchingTop10(test.Test):
test = tab_switching.TabSwitching test = tab_switching.TabSwitching
...@@ -15,7 +16,6 @@ class TabSwitchingFiveBlankTabs(test.Test): ...@@ -15,7 +16,6 @@ class TabSwitchingFiveBlankTabs(test.Test):
page_set = 'page_sets/five_blank_pages.py' page_set = 'page_sets/five_blank_pages.py'
options = {'pageset_repeat': 10} options = {'pageset_repeat': 10}
@test.Disabled('android')
class TabSwitchingToughEnergyCases(test.Test): class TabSwitchingToughEnergyCases(test.Test):
test = tab_switching.TabSwitching test = tab_switching.TabSwitching
page_set = 'page_sets/tough_energy_cases.py' page_set = 'page_sets/tough_energy_cases.py'
......
...@@ -15,7 +15,7 @@ from telemetry.unittest import options_for_unittests ...@@ -15,7 +15,7 @@ from telemetry.unittest import options_for_unittests
class MeasurementUnitTest(unittest.TestCase): class MeasurementUnitTest(unittest.TestCase):
# TODO(achuith): Fix crbug.com/351114. # TODO(achuith): Fix crbug.com/351114.
@test.Disabled('chromeos') @test.Disabled('android', 'chromeos')
def testMeasurementSmoke(self): def testMeasurementSmoke(self):
# Run all Measurements against the first Page in the PageSet of the first # Run all Measurements against the first Page in the PageSet of the first
# Benchmark that uses them. # Benchmark that uses them.
......
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