Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(377)

Unified Diff: telemetry/telemetry/core/tracing_controller_unittest.py

Issue 1819183002: [Telemetry] Add battor tracing agent (Closed) Base URL: git@github.com:catapult-project/catapult@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: telemetry/telemetry/core/tracing_controller_unittest.py
diff --git a/telemetry/telemetry/core/tracing_controller_unittest.py b/telemetry/telemetry/core/tracing_controller_unittest.py
index 1cc097c93a9ae137c7590376d7f393e3625f7fba..54a313d2986852bba8653ac0d37b745140ce0b1c 100644
--- a/telemetry/telemetry/core/tracing_controller_unittest.py
+++ b/telemetry/telemetry/core/tracing_controller_unittest.py
@@ -2,12 +2,16 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import time
+
+from battor import battor_wrapper
from telemetry import decorators
from telemetry.core import platform as platform_module
from telemetry.testing import browser_test_case
from telemetry.testing import tab_test_case
from telemetry.timeline import model as model_module
from telemetry.timeline import tracing_config
+from telemetry.timeline import trace_data as trace_data_module
class TracingControllerTest(tab_test_case.TabTestCase):
@@ -182,3 +186,20 @@ class TracingControllerTest(tab_test_case.TabTestCase):
@decorators.Isolated
def testStartupTracingOnDesktop(self):
self._StartupTracing(platform_module.GetHostPlatform())
+
+ def testBattOrTracing(self):
+ test_platform = self._browser.platform.GetOSName()
+ device = (self._browser.platform._platform_backend.device
+ if test_platform == 'android' else None)
+ if (not battor_wrapper.IsBattOrConnected(test_platform,
+ android_device=device)):
+ return # Test require battor present.
charliea (OOO until 10-5) 2016/05/09 21:30:32 nit: 'Test require battor present.' doesn't seem l
rnephew (Reviews Here) 2016/05/10 15:51:44 Done.
+
+ tracing_controller = self._browser.platform.tracing_controller
+ config = tracing_config.TracingConfig()
+ config.enable_battor_trace = True
+ tracing_controller.StartTracing(config)
+ time.sleep(1) # Cannot imediately start then stop tracing. crbug.com/602266
charliea (OOO until 10-5) 2016/05/09 21:30:32 nit: s/imediately/immediately Also, not crazy abo
rnephew (Reviews Here) 2016/05/10 15:51:44 Done.
+ trace_data = tracing_controller.StopTracing()
+ self.assertTrue(
+ trace_data.HasEventsFor(trace_data_module.BATTOR_TRACE_PART))

Powered by Google App Engine
This is Rietveld 408576698