Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / page / actions / seek_unittest.py

diff --git a/src/tools/telemetry/telemetry/page/actions/seek_unittest.py b/src/tools/telemetry/telemetry/page/actions/seek_unittest.py
index ab6190e..c273cac 100644 (file)
--- a/src/tools/telemetry/telemetry/page/actions/seek_unittest.py
+++ b/src/tools/telemetry/telemetry/page/actions/seek_unittest.py
@@ -4,8 +4,9 @@
 
 from telemetry.core import util
 from telemetry.page.actions import seek
-from telemetry.unittest import DisabledTestOnCrOS
 from telemetry.unittest import tab_test_case
+from telemetry.unittest import test
+
 
 AUDIO_1_SEEKED_CHECK = 'window.__hasEventCompleted("#audio_1", "seeked");'
 VIDEO_1_SEEKED_CHECK = 'window.__hasEventCompleted("#video_1", "seeked");'
@@ -19,7 +20,7 @@ class SeekActionTest(tab_test_case.TabTestCase):
     self._tab.Navigate(self._browser.http_server.UrlOf('video_test.html'))
     self._tab.WaitForDocumentReadyStateToBeComplete()
 
-  @DisabledTestOnCrOS
+  @test.Disabled('chromeos')
   def testSeekWithNoSelector(self):
     """Tests that with no selector Seek  action seeks first media element."""
     data = {'wait_for_seeked': True, 'seek_time': 1}
@@ -30,7 +31,7 @@ class SeekActionTest(tab_test_case.TabTestCase):
     self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
     self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
 
-  @DisabledTestOnCrOS
+  @test.Disabled('chromeos')
   def testSeekWithVideoSelector(self):
     """Tests that Seek action seeks video element matching selector."""
     data = {'selector': '#video_1', 'wait_for_seeked': True, 'seek_time': 1}
@@ -44,7 +45,7 @@ class SeekActionTest(tab_test_case.TabTestCase):
     self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
     self.assertFalse(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
 
-  @DisabledTestOnCrOS
+  @test.Disabled('chromeos')
   def testSeekWithAllSelector(self):
     """Tests that Seek action seeks all video elements with selector='all'."""
     data = {'selector': 'all', 'wait_for_seeked': True, 'seek_time': 1}
@@ -58,8 +59,7 @@ class SeekActionTest(tab_test_case.TabTestCase):
     self.assertTrue(self._tab.EvaluateJavaScript(VIDEO_1_SEEKED_CHECK))
     self.assertTrue(self._tab.EvaluateJavaScript(AUDIO_1_SEEKED_CHECK))
 
-  # http://crbug.com/273887
-  @DisabledTestOnCrOS
+  @test.Disabled('chromeos')   # http://crbug.com/273887
   def testSeekWaitForSeekTimeout(self):
     """Tests that wait_for_seeked timeouts if video does not seek."""
     data = {'selector': '#video_1',