| Index: build/android/chrome_profiler/perf_controller_unittest.py
|
| diff --git a/build/android/chrome_profiler/systrace_controller_unittest.py b/build/android/chrome_profiler/perf_controller_unittest.py
|
| similarity index 53%
|
| copy from build/android/chrome_profiler/systrace_controller_unittest.py
|
| copy to build/android/chrome_profiler/perf_controller_unittest.py
|
| index 448f3283945b8555d0c1e48ed2dd75ef51f59dd7..a621a2e88eacfffe26ecfc1b085b368931030786 100644
|
| --- a/build/android/chrome_profiler/systrace_controller_unittest.py
|
| +++ b/build/android/chrome_profiler/perf_controller_unittest.py
|
| @@ -3,24 +3,26 @@
|
| # found in the LICENSE file.
|
|
|
| import os
|
| +import json
|
|
|
| from chrome_profiler import controllers_unittest
|
| -from chrome_profiler import systrace_controller
|
| +from chrome_profiler import perf_controller
|
|
|
|
|
| -class SystraceControllerTest(controllers_unittest.BaseControllerTest):
|
| +class PerfProfilerControllerTest(controllers_unittest.BaseControllerTest):
|
| def testGetCategories(self):
|
| + if not perf_controller.PerfProfilerController.IsSupported():
|
| + return
|
| categories = \
|
| - systrace_controller.SystraceController.GetCategories(self.device)
|
| - self.assertTrue(categories)
|
| - assert 'gfx' in ' '.join(categories)
|
| + perf_controller.PerfProfilerController.GetCategories(self.device)
|
| + assert 'cycles' in ' '.join(categories)
|
|
|
| def testTracing(self):
|
| - categories = ['gfx', 'input', 'view']
|
| - ring_buffer = False
|
| - controller = systrace_controller.SystraceController(self.device,
|
| - categories,
|
| - ring_buffer)
|
| + if not perf_controller.PerfProfilerController.IsSupported():
|
| + return
|
| + categories = ['cycles']
|
| + controller = perf_controller.PerfProfilerController(self.device,
|
| + categories)
|
|
|
| interval = 1
|
| try:
|
| @@ -31,6 +33,6 @@ class SystraceControllerTest(controllers_unittest.BaseControllerTest):
|
| result = controller.PullTrace()
|
| try:
|
| with open(result) as f:
|
| - self.assertTrue('CPU#' in f.read())
|
| + json.loads(f.read())
|
| finally:
|
| os.remove(result)
|
|
|