commit c26a323210533d4ed3a8b4e62c33744236e3beda
author Javi Merino <javi.merino@arm.com> Fri Dec 11 18:00:30 2015 +0000
committer Javi Merino <javi.merino@arm.com> Tue Dec 22 15:49:30 2015 +0000
tree 4b0a3c4b1ae071737f683941b4b2aa289861a51f
parent 08ea8c25cd7ed23b17e09363d08054eb5bc27688

ftrace: rename Run to FTrace

Run is a very generic and inappropriate name for an object that parses
the result of ftrace into a form consumable by python.  Rename it to
FTrace in preparation for its generalization.

tests/test_constraint.py

diff --git a/tests/test_constraint.py b/tests/test_constraint.py
index 31e6da7..20b5525 100644
--- a/tests/test_constraint.py
+++ b/tests/test_constraint.py
@@ -49,8 +49,8 @@
         self.assertEquals(series.to_dict().values(),
                           dfr["load"].to_dict().values())
 
-    def test_no_pivot_multiple_runs(self):
-        """Test that the constraint manager works with multiple runs and no pivots"""
+    def test_no_pivot_multiple_traces(self):
+        """Test that the constraint manager works with multiple traces and no pivots"""
 
         c_mgr = ConstraintManager(self.dfrs, "load", None, AttrConf.PIVOT, {})
 
@@ -61,8 +61,8 @@
             self.assertEquals(series.to_dict().values(),
                               orig_dfr["load"].to_dict().values())
 
-    def test_no_pivot_zipped_columns_and_runs(self):
-        """Test the constraint manager with multiple columns and runs zipped"""
+    def test_no_pivot_zipped_columns_and_traces(self):
+        """Test the constraint manager with multiple columns and traces zipped"""
 
         c_mgr = ConstraintManager(self.dfrs, self.cols, None, AttrConf.PIVOT, {})
 
@@ -73,8 +73,8 @@
             self.assertEquals(series.to_dict().values(),
                               orig_dfr[col].to_dict().values())
 
-    def test_no_pivot_multicolumns_multiruns(self):
-        """Test the constraint manager with multiple runs that can have each multiple columns"""
+    def test_no_pivot_multicolumns_multitraces(self):
+        """Test the constraint manager with multiple traces that can have each multiple columns"""
 
         c_mgr = ConstraintManager(self.dfrs, self.cols, None, AttrConf.PIVOT,
                                   {}, zip_constraints=False)
@@ -106,7 +106,7 @@
         self.assertEquals(series_second_frame.to_dict().values(), [3, 2])
 
     def test_pivoted_data(self):
-        """Test the constraint manager with a pivot and one run"""
+        """Test the constraint manager with a pivot and one trace"""
 
         c_mgr = ConstraintManager(self.dfrs[0], "load", None, "cpu", {})
 
@@ -118,8 +118,8 @@
 
         self.assertEquals(results, expected_results)
 
-    def test_pivoted_multirun(self):
-        """Test the constraint manager with a pivot and multiple runs"""
+    def test_pivoted_multitrace(self):
+        """Test the constraint manager with a pivot and multiple traces"""
 
         c_mgr = ConstraintManager(self.dfrs, "load", None, "cpu", {})
 
@@ -132,8 +132,8 @@
         constraint = constraint_iter.next()
         self.assertEquals(constraint.result[1].to_dict().values(), [2, 2])
 
-    def test_pivoted_multiruns_multicolumns(self):
-        """Test the constraint manager with multiple runs and columns"""
+    def test_pivoted_multitraces_multicolumns(self):
+        """Test the constraint manager with multiple traces and columns"""
 
         c_mgr = ConstraintManager(self.dfrs, ["load", "freq"], None, "cpu", {})
         self.assertEquals(len(c_mgr), 2)