Disable tests in system_health_smoke_test that takes 100+ seconds

BUG=641934
TBR=petrcermak@chromium.org
NOTRY=true

Review-Url: https://codereview.chromium.org/2293553002
Cr-Commit-Position: refs/heads/master@{#415167}

tools/perf/benchmarks/system_health_smoke_test.py

@@ -37,6 +37,18 @@ _DISABLED_TESTS = frozenset({
   'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.browse:news:nytimes',  # pylint: disable=line-too-long
   # crbug.com/637230
   'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_desktop.browse:news:cnn',  # pylint: disable=line-too-long
+
+  # crbug.com/641934
+  # These tests are taking too long (more than 100s each).
+  # TODO(nedn): reenable these test once we have more capacity to run them on
+  # CQ.
+  'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.browse:news:flipboard',  # pylint: disable=line-too-long
+  'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.browse:media:imgur',  # pylint: disable=line-too-long
+  'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.browse:media:youtube',  # pylint: disable=line-too-long
+  'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.browse:media:facebook_photos',  # pylint: disable=line-too-long
+  'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.browse:news:reddit',  # pylint: disable=line-too-long
+  'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.browse:social:facebook',  # pylint: disable=line-too-long
+  'benchmarks.system_health_smoke_test.SystemHealthBenchmarkSmokeTest.system_health.memory_mobile.load:news:cnn',  # pylint: disable=line-too-long
 })
 
 

tools/perf/scripts_smoke_unittest.py

@@ -39,15 +39,15 @@ class ScriptsSmokeTest(unittest.TestCase):
     self.assertIn('No benchmark named "foo"', stdout)
     self.assertNotEquals(return_code, 0)
 
-  # crbug.com/483212
-  @benchmark.Disabled('chromeos')
+  @benchmark.Disabled('chromeos')  # crbug.com/483212
+  @benchmark.Disabled('android')   # crbug.com/641934
   def testRunBenchmarkListListsOutBenchmarks(self):
     return_code, stdout = self.RunPerfScript('run_benchmark list')
     self.assertEquals(return_code, 0, stdout)
     self.assertIn('Pass --browser to list benchmarks', stdout)
     self.assertIn('dummy_benchmark.stable_benchmark_1', stdout)
 
-  @benchmark.Enabled('android')
+  @benchmark.Disabled('all')  # crbug.com/641934
   def testRunBenchmarkListListsOutBenchmarksOnAndroid(self):
     return_code, stdout = self.RunPerfScript(
         'run_benchmark list --device=android --browser=android-chromium')