1 files changed, 2 insertions, 18 deletions
diff --git a/systrace/catapult/systrace/systrace/tracing_agents/atrace_agent_unittest.py b/systrace/catapult/systrace/systrace/tracing_agents/atrace_agent_unittest.py
index 1a1b9b2..af30c92 100755
--- a/systrace/catapult/systrace/systrace/tracing_agents/atrace_agent_unittest.py
+++ b/systrace/catapult/systrace/systrace/tracing_agents/atrace_agent_unittest.py
@@ -27,13 +27,6 @@ SYSTRACE_CMD = ['./run_systrace.py', '--time', '10', '-o', 'out.html', '-e',
                 DEVICE_SERIAL] + CATEGORIES
 TRACE_ARGS = (ATRACE_ARGS + CATEGORIES)
 
-SYSTRACE_BOOT_CMD = (['./run_systrace.py', '--boot', '-e', DEVICE_SERIAL] +
-                     CATEGORIES)
-TRACE_BOOT_CMD = (ADB_SHELL +
-                  ['atrace', '--async_stop', '&&', 'setprop',
-                   'persist.debug.atrace.boottrace', '0', '&&',
-                   'rm', '/data/misc/boottrace/categories'])
-
 TEST_DIR = os.path.join(os.path.dirname(__file__), os.pardir, 'test_data')
 ATRACE_DATA = os.path.join(TEST_DIR, 'atrace_data')
 ATRACE_DATA_RAW = os.path.join(TEST_DIR, 'atrace_data_raw')
@@ -111,7 +104,7 @@ class AtraceAgentTest(unittest.TestCase):
       for dump_file_name in ATRACE_PS_DUMPS:
         with open(dump_file_name, 'r') as dump_file:
           ps_dump = dump_file.read()
-          thread_names = atrace_agent.extract_thread_list(ps_dump)
+          thread_names = atrace_agent.extract_thread_list(ps_dump.splitlines())
           self.assertEqual(expected, str(thread_names))
 
   @decorators.HostOnlyTest
@@ -148,7 +141,7 @@ class AtraceAgentTest(unittest.TestCase):
       atrace_procfs_extracted = f2.read()
 
       tgids = eval(atrace_procfs_extracted)
-      result = atrace_agent.extract_tgids(atrace_procfs_dump)
+      result = atrace_agent.extract_tgids(atrace_procfs_dump.splitlines())
 
       self.assertEqual(result, tgids)
 
@@ -166,15 +159,6 @@ class AtraceAgentTest(unittest.TestCase):
       self.assertEqual(res, fixed)
 
 
-class BootAgentTest(unittest.TestCase):
-
-  @decorators.HostOnlyTest
-  def test_boot(self):
-    options, _ = run_systrace.parse_options(SYSTRACE_BOOT_CMD)
-    tracer_args = atrace_agent._construct_boot_trace_command(options)
-    self.assertEqual(' '.join(TRACE_BOOT_CMD), ' '.join(tracer_args))
-
-
 if __name__ == "__main__":
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)