summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/metrics/speedindex_unittest.py2
-rw-r--r--tools/perf/page_sets/presubmit_unittest.py3
-rw-r--r--tools/telemetry/telemetry/core/browser_unittest.py2
3 files changed, 0 insertions, 7 deletions
diff --git a/tools/perf/metrics/speedindex_unittest.py b/tools/perf/metrics/speedindex_unittest.py
index 1ac4db6..a16d56b 100644
--- a/tools/perf/metrics/speedindex_unittest.py
+++ b/tools/perf/metrics/speedindex_unittest.py
@@ -10,7 +10,6 @@ import os
import unittest
from telemetry.core.timeline import model
-from telemetry.unittest import DisabledTestOnCrOS
from metrics import speedindex
# Sample timeline data in the json format provided by devtools.
@@ -97,7 +96,6 @@ class SpeedIndexImplTest(unittest.TestCase):
self.assertEquals(time_area_dict[400], 200000)
self.assertEquals(time_area_dict[800], 200000)
- @DisabledTestOnCrOS
def testVideoCompleteness(self):
frames = [
(0.0, FakeBitmap([100, 0, 0])),
diff --git a/tools/perf/page_sets/presubmit_unittest.py b/tools/perf/page_sets/presubmit_unittest.py
index a639ea4..b3d0569 100644
--- a/tools/perf/page_sets/presubmit_unittest.py
+++ b/tools/perf/page_sets/presubmit_unittest.py
@@ -9,7 +9,6 @@ import unittest
PERF_ROOT = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.insert(0, os.path.join(os.path.dirname(PERF_ROOT), 'telemetry'))
-from telemetry.unittest import DisabledTestOnCrOS
from telemetry.unittest import system_stub
sys.path.insert(0, PERF_ROOT)
@@ -122,12 +121,10 @@ class PresubmitTest(unittest.TestCase):
self.assertResultCount(results, 1, 0)
self.assertTrue('not found' in str(results[0]), msg=results[0])
- @DisabledTestOnCrOS
def testSkip(self):
results = self._CheckUpload(['/path/to/skip.wpr.sha1'])
self.assertResultCount(results, 0, 0)
- @DisabledTestOnCrOS
def testSuccess(self):
results = self._CheckUpload(['/path/to/success.wpr.sha1'])
self.assertResultCount(results, 0, 1)
diff --git a/tools/telemetry/telemetry/core/browser_unittest.py b/tools/telemetry/telemetry/core/browser_unittest.py
index 2588bdb..d389cf2 100644
--- a/tools/telemetry/telemetry/core/browser_unittest.py
+++ b/tools/telemetry/telemetry/core/browser_unittest.py
@@ -10,7 +10,6 @@ from telemetry.core import gpu_device
from telemetry.core import gpu_info
from telemetry.core import system_info
from telemetry.core import util
-from telemetry.unittest import DisabledTestOnCrOS
from telemetry.unittest import options_for_unittests
class BrowserTest(unittest.TestCase):
@@ -70,7 +69,6 @@ class BrowserTest(unittest.TestCase):
self.assertEquals(t.EvaluateJavaScript('navigator.userAgent'),
'telemetry')
- @DisabledTestOnCrOS
def testVersionDetection(self):
b = self.CreateBrowser()
v = b._browser_backend._inspector_protocol_version # pylint: disable=W0212