[DO NOT COMMIT] Refactor systrace to support new clock sync design

systrace/systrace/tracing_agents/atrace_agent_unittest.py

Index: systrace/systrace/tracing_agents/atrace_agent_unittest.py
diff --git a/systrace/systrace/agents/atrace_agent_unittest.py b/systrace/systrace/tracing_agents/atrace_agent_unittest.py
old mode 100644
new mode 100755
similarity index 68%
rename from systrace/systrace/agents/atrace_agent_unittest.py
rename to systrace/systrace/tracing_agents/atrace_agent_unittest.py
index 5fbf24b65efadfe02287a0d30f48f8249340cfa6..6955ae9eb4c221761b1c262af0ad8344736a1f13
--- a/systrace/systrace/agents/atrace_agent_unittest.py
+++ b/systrace/systrace/tracing_agents/atrace_agent_unittest.py
@@ -5,11 +5,12 @@
 # found in the LICENSE file.
 
 import contextlib
+import logging
 import os
 import unittest
 
-from systrace import systrace
-from systrace.agents import atrace_agent
+from systrace import run_systrace
+from systrace.tracing_agents import atrace_agent
 
 DEVICE_SERIAL = 'AG8404EC0444AGC'
 ATRACE_ARGS = ['atrace', '-z', '-t', '10', '-b', '4096']
@@ -18,7 +19,7 @@ ADB_SHELL = ['adb', '-s', DEVICE_SERIAL, 'shell']
 
 SYSTRACE_CMD = ['./systrace.py', '--time', '10', '-o', 'out.html', '-e',
                 DEVICE_SERIAL] + CATEGORIES
-TRACE_CMD = (ADB_SHELL + ATRACE_ARGS + CATEGORIES)
+TRACE_ARGS = (ATRACE_ARGS + CATEGORIES)
 
 SYSTRACE_LIST_CATEGORIES_CMD = ['./systrace.py', '-e', DEVICE_SERIAL, '-l']
 TRACE_LIST_CATEGORIES_CMD = (ADB_SHELL + ['atrace', '--list_categories'])
@@ -26,12 +27,13 @@ TRACE_LIST_CATEGORIES_CMD = (ADB_SHELL + ['atrace', '--list_categories'])
 LEGACY_ATRACE_ARGS = ['atrace', '-z', '-t', '10', '-b', '4096', '-s']
 LEGACY_TRACE_CMD = (ADB_SHELL + LEGACY_ATRACE_ARGS)
 
-STOP_FIX_UPS = ['atrace', '--no-fix-threads', '--no-fix-tgids']
+STOP_FIX_UPS = ['atrace', '-e', DEVICE_SERIAL,
+                '--no-fix-threads', '--no-fix-tgids']
 
 
 SYSTRACE_BOOT_CMD = (['./systrace.py', '--boot', '-e', DEVICE_SERIAL] +
                      CATEGORIES)
-TRACE_BOOT_CMD = (ADB_SHELL +
+TRACE_BOOT_CMD = (
                   ['atrace', '--async_stop', '&&', 'setprop',
                    'persist.debug.atrace.boottrace', '0', '&&',
                    'rm', '/data/misc/boottrace/categories'])
@@ -55,12 +57,10 @@ ATRACE_FIXED_TGIDS = os.path.join(TEST_DIR, 'atrace_fixed_tgids')
 
 class AtraceAgentTest(unittest.TestCase):
 
-  def test_construct_trace_command(self):
-    options, categories = systrace.parse_options(SYSTRACE_CMD)
-    agent = atrace_agent.AtraceAgent(options, categories)
-    tracer_args = agent._construct_trace_command()
-    self.assertEqual(' '.join(TRACE_CMD), ' '.join(tracer_args))
-    self.assertEqual(True, agent.expect_trace())
+  def test_construct_trace_args(self):
+    options, categories = run_systrace.parse_options(SYSTRACE_CMD)
+    tracer_args = atrace_agent._construct_trace_args(options, categories)
+    self.assertEqual(' '.join(TRACE_ARGS), ' '.join(tracer_args))
 
   def test_extract_thread_list(self):
     with contextlib.nested(open(ATRACE_EXTRACTED_THREADS, 'r'),
@@ -101,28 +101,14 @@ class AtraceAgentTest(unittest.TestCase):
       atrace_data = f1.read()
       atrace_data_raw = f2.read()
 
-      options, categories = systrace.parse_options(STOP_FIX_UPS)
-      agent = atrace_agent.AtraceAgent(options, categories)
+      agent = atrace_agent.AtraceAgent()
+      agent._postproc = atrace_agent.atrace_postproc(True, True, True)
+      agent._device_serial = 'AG8404EC0444AGC'
+
       trace_data = agent._preprocess_trace_data(atrace_data_raw)
 
       self.assertEqual(atrace_data, trace_data)
 
-  def test_list_categories(self):
-    options, categories = systrace.parse_options(SYSTRACE_LIST_CATEGORIES_CMD)
-    agent = atrace_agent.AtraceAgent(options, categories)
-    tracer_args = agent._construct_trace_command()
-    self.assertEqual(' '.join(TRACE_LIST_CATEGORIES_CMD), ' '.join(tracer_args))
-    self.assertEqual(False, agent.expect_trace())
-
-  def test_construct_trace_from_file_command(self):
-    options, categories = systrace.parse_options(['systrace.py',
-        '--from-file', ATRACE_DATA_RAW_FROM_FILE])
-    agent = atrace_agent.try_create_agent(options, categories)
-    tracer_args = agent._construct_trace_command()
-    self.assertEqual(' '.join(['cat', ATRACE_DATA_RAW_FROM_FILE]),
-            ' '.join(tracer_args))
-    self.assertEqual(True, agent.expect_trace())
-
   def test_extract_tgids(self):
     with contextlib.nested(open(ATRACE_PROCFS_DUMP, 'r'),
                            open(ATRACE_EXTRACTED_TGIDS, 'r')) as (f1, f2):
@@ -148,21 +134,12 @@ class AtraceAgentTest(unittest.TestCase):
       self.assertEqual(res, fixed)
 
 
-class AtraceLegacyAgentTest(unittest.TestCase):
-
-  def test_construct_trace_command(self):
-    options, categories = systrace.parse_options(SYSTRACE_CMD)
-    agent = atrace_agent.AtraceLegacyAgent(options, categories)
-    tracer_args = agent._construct_trace_command()
-    self.assertEqual(' '.join(LEGACY_TRACE_CMD), ' '.join(tracer_args))
-    self.assertEqual(True, agent.expect_trace())
-
-
 class BootAgentTest(unittest.TestCase):
 
   def test_boot(self):
-    options, categories = systrace.parse_options(SYSTRACE_BOOT_CMD)
-    agent = atrace_agent.BootAgent(options, categories)
-    tracer_args = agent._construct_trace_command()
-    self.assertEqual(' '.join(TRACE_BOOT_CMD), ' '.join(tracer_args))
-    self.assertEqual(True, agent.expect_trace())
+    dump_args = atrace_agent.get_boot_dump_cmd()
+    self.assertEqual(' '.join(TRACE_BOOT_CMD), ' '.join(dump_args))
+
+if __name__ == "__main__":
+  logging.getLogger().setLevel(logging.DEBUG)
+  unittest.main(verbosity=2)