1 files changed, 9 insertions, 4 deletions
diff --git a/catapult/systrace/profile_chrome/perf_tracing_agent_unittest.py b/catapult/systrace/profile_chrome/perf_tracing_agent_unittest.py
index 1367e9b7..8f8a7f7a 100644
--- a/catapult/systrace/profile_chrome/perf_tracing_agent_unittest.py
+++ b/catapult/systrace/profile_chrome/perf_tracing_agent_unittest.py
@@ -7,9 +7,11 @@ import json
 from profile_chrome import agents_unittest
 from profile_chrome import perf_tracing_agent
 from profile_chrome import ui
+from systrace import decorators
 
 
 class PerfProfilerAgentTest(agents_unittest.BaseAgentTest):
+  @decorators.ClientOnlyTest
   def testGetCategories(self):
     if not perf_tracing_agent.PerfProfilerAgent.IsSupported():
       return
@@ -17,16 +19,19 @@ class PerfProfilerAgentTest(agents_unittest.BaseAgentTest):
         perf_tracing_agent.PerfProfilerAgent.GetCategories(self.device)
     assert 'cycles' in ' '.join(categories)
 
+  # TODO(washingtonp): Try enabling this test for the SimpleperfProfilerAgent,
+  # which will be added later.
+  @decorators.Disabled
   def testTracing(self):
     if not perf_tracing_agent.PerfProfilerAgent.IsSupported():
       return
     ui.EnableTestMode()
-    categories = ['cycles']
-    agent = perf_tracing_agent.PerfProfilerAgent(self.device,
-                                                 categories)
+    categories = 'cycles'
+    agent = perf_tracing_agent.PerfProfilerAgent(self.device)
 
     try:
-      agent.StartAgentTracing(None, None)
+      agent.StartAgentTracing(perf_tracing_agent.PerfConfig(categories,
+                                                            self.device))
     finally:
       agent.StopAgentTracing()