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

systrace/systrace/agents/ftrace_agent_unittest.py

Index: systrace/systrace/agents/ftrace_agent_unittest.py
diff --git a/systrace/systrace/agents/ftrace_agent_unittest.py b/systrace/systrace/agents/ftrace_agent_unittest.py
old mode 100644
new mode 100755
index 9e8ea607aedbdbaab983dfe46cc7c3c922041b75..3a854c9e30fcd18f0eff693c62ee837ed81b3114
--- a/systrace/systrace/agents/ftrace_agent_unittest.py
+++ b/systrace/systrace/agents/ftrace_agent_unittest.py
@@ -5,8 +5,8 @@
 # found in the LICENSE file.
 
 import unittest
-
-from systrace import systrace
+import logging
+from systrace import run_systrace
 from systrace.agents import ftrace_agent
 
 SYSTRACE_HOST_CMD_DEFAULT = ['./systrace.py', '--target=linux']
@@ -46,14 +46,14 @@ class FtraceAgentTest(unittest.TestCase):
       FT_EVENT_DIR + "sched/sched_wakeup/enable": "0"
     }
     io_interface = make_test_io_interface(permitted_files)
-    options, categories = systrace.parse_options(SYSTRACE_HOST_CMD_DEFAULT)
+    options, categories = run_systrace.parse_options(SYSTRACE_HOST_CMD_DEFAULT)
     agent = ftrace_agent.FtraceAgent(options, categories, io_interface)
     self.assertEqual(['sched'], agent._avail_categories())
 
     # check for no available categories
     permitted_files = {}
     io_interface = make_test_io_interface(permitted_files)
-    options, categories = systrace.parse_options(SYSTRACE_HOST_CMD_DEFAULT)
+    options, categories = run_systrace.parse_options(SYSTRACE_HOST_CMD_DEFAULT)
     agent = ftrace_agent.FtraceAgent(options, categories, io_interface)
     self.assertEqual([], agent._avail_categories())
 
@@ -63,7 +63,7 @@ class FtraceAgentTest(unittest.TestCase):
       FT_EVENT_DIR + "block/block_rq_issue/enable": "0"
     }
     io_interface = make_test_io_interface(permitted_files)
-    options, categories = systrace.parse_options(SYSTRACE_HOST_CMD_DEFAULT)
+    options, categories = run_systrace.parse_options(SYSTRACE_HOST_CMD_DEFAULT)
     agent = ftrace_agent.FtraceAgent(options, categories, io_interface)
     self.assertEqual(['disk'], agent._avail_categories())
 
@@ -75,12 +75,12 @@ class FtraceAgentTest(unittest.TestCase):
     }
     io_interface = make_test_io_interface(permitted_files)
     systrace_cmd = SYSTRACE_HOST_CMD_DEFAULT + ["workq"]
-    options, categories = systrace.parse_options(systrace_cmd)
+    options, categories = run_systrace.parse_options(systrace_cmd)
     agent = ftrace_agent.FtraceAgent(options, categories, io_interface)
     self.assertEqual(['workq'], agent._avail_categories())
 
     # confirm tracing is enabled, buffer is cleared
-    agent.start()
+    agent.StartAgentTracing()
     self.assertEqual(permitted_files[FT_TRACE_ON], "1")
     self.assertEqual(permitted_files[FT_TRACE], "")
 
@@ -89,12 +89,12 @@ class FtraceAgentTest(unittest.TestCase):
     permitted_files[FT_TRACE] = dummy_trace
 
     # confirm tracing is disabled
-    agent.collect_result()
+    agent.StopAgentTracing()
+    self.assertEqual(agent._should_output_trace, True)
     self.assertEqual(permitted_files[FT_TRACE_ON], "0")
 
     # confirm trace is expected, and read from fs
-    self.assertTrue(agent.expect_trace())
-    self.assertEqual(agent.get_trace_data(), dummy_trace)
+    self.assertEqual(agent.GetResults().trace_data, dummy_trace)
 
     # confirm buffer size is reset to 1
     self.assertEqual(permitted_files[FT_BUFFER_SIZE], "1")
@@ -109,28 +109,32 @@ class FtraceAgentTest(unittest.TestCase):
     }
     io_interface = make_test_io_interface(permitted_files)
     systrace_cmd = SYSTRACE_HOST_CMD_DEFAULT + ["irq"]
-    options, categories = systrace.parse_options(systrace_cmd)
+    options, categories = run_systrace.parse_options(systrace_cmd)
     agent = ftrace_agent.FtraceAgent(options, categories, io_interface)
     self.assertEqual(['irq'], agent._avail_categories())
 
     # confirm all the event nodes are turned on during tracing
-    agent.start()
+    agent.StartAgentTracing()
     self.assertEqual(permitted_files[irq_event_path], "1")
     self.assertEqual(permitted_files[ipi_event_path], "1")
 
     # and then turned off when completed.
-    agent.collect_result()
+    agent.StopAgentTracing()
     self.assertEqual(permitted_files[irq_event_path], "0")
     self.assertEqual(permitted_files[ipi_event_path], "0")
 
   def test_trace_time(self):
     systrace_cmd = SYSTRACE_HOST_CMD_DEFAULT + ['-t', '10']
-    options, categories = systrace.parse_options(systrace_cmd)
+    options, categories = run_systrace.parse_options(systrace_cmd)
     agent = ftrace_agent.FtraceAgent(options, categories)
     self.assertEqual(agent._get_trace_time(), 10)
 
   def test_buffer_size(self):
     systrace_cmd = SYSTRACE_HOST_CMD_DEFAULT + ['-b', '16000']
-    options, categories = systrace.parse_options(systrace_cmd)
+    options, categories = run_systrace.parse_options(systrace_cmd)
     agent = ftrace_agent.FtraceAgent(options, categories)
     self.assertEqual(agent._get_trace_buffer_size(), 16000)
+
+if __name__ == "__main__":
+  logging.getLogger().setLevel(logging.DEBUG)
+  unittest.main(verbosity=2)