Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / platform / android_platform_backend_unittest.py

diff --git a/src/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py b/src/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py
index 09e9a54..c5cbe65 100644 (file)
--- a/src/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py
+++ b/src/tools/telemetry/telemetry/core/platform/android_platform_backend_unittest.py
@@ -6,10 +6,11 @@ import logging
 import os
 import unittest
 
+from telemetry import test
 from telemetry.core import bitmap
 from telemetry.core import util
 from telemetry.core.platform import android_platform_backend
-from telemetry.unittest import DisabledTest, system_stub
+from telemetry.unittest import system_stub
 
 
 class MockAdbCommands(object):
@@ -23,6 +24,12 @@ class MockAdbCommands(object):
   def GetProtectedFileContents(self, file_name, log_result):
     return self.mock_content
 
+  def PushIfNeeded(self, host_binary, device_path):
+    pass
+
+  def RunShellCommand(self, command):
+    return []
+
 
 class AndroidPlatformBackendTest(unittest.TestCase):
   def setUp(self):
@@ -32,6 +39,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):
   def tearDown(self):
     self._stubs.Restore()
 
+  @test.Disabled('chromeos')
   def testGetCpuStats(self):
     proc_stat_content = [
         '7702 (.android.chrome) S 167 167 0 0 -1 1077936448 '
@@ -45,6 +53,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):
     cpu_stats = backend.GetCpuStats('7702')
     self.assertEquals(cpu_stats, {'CpuProcessTime': 5.0})
 
+  @test.Disabled('chromeos')
   def testGetCpuStatsInvalidPID(self):
     # Mock an empty /proc/pid/stat.
     adb_empty_proc_stat = MockAdbCommands([])
@@ -53,7 +62,7 @@ class AndroidPlatformBackendTest(unittest.TestCase):
     cpu_stats = backend.GetCpuStats('7702')
     self.assertEquals(cpu_stats, {})
 
-  @DisabledTest
+  @test.Disabled
   def testFramesFromMp4(self):
     mock_adb = MockAdbCommands([])
     backend = android_platform_backend.AndroidPlatformBackend(mock_adb, False)