commit 1882075d72faef8e7d14e2eab0623c1f97819bef
author Kapileshwar Singh <kapileshwar.singh@arm.com> Wed Feb 11 12:01:08 2015 +0000
committer Javi Merino <javi.merino@arm.com> Wed Aug 12 16:03:45 2015 +0100
tree 10428ee2593d583c4cf29eda4b1dea73fa3ee1a8
parent 4551030a70fa46ca9922d10888e6d60bd3a68a14

tests: plotter: Modifications for change in column names

The InPower Event Class has dynamic_power and static_power
column and OutPower has a single power column. This change
handles the different column names

Change-Id: I9317e1b4ce74ec01f589b5a3ed283fbe3c4652af
Signed-off-by: Kapileshwar Singh <kapileshwar.singh@arm.com>

tests/test_plotter.py

diff --git a/tests/test_plotter.py b/tests/test_plotter.py
index 83b0638..76b4ccb 100644
--- a/tests/test_plotter.py
+++ b/tests/test_plotter.py
@@ -36,11 +36,11 @@
         run1 = cr2.Run(name="first")
         run2 = cr2.Run(name="second")
         l = cr2.LinePlot([run1,
-                                  run2],
-                                 [cr2.thermal.Thermal,
-                                  cr2.thermal.ThermalGovernor],
-                                 column=["temp",
-                                         "power_range"])
+                          run2],
+                         [cr2.thermal.Thermal,
+                          cr2.thermal.ThermalGovernor],
+                         column=["temp",
+                                 "power_range"])
         l.view()
         matplotlib.pyplot.close('all')
 
@@ -49,10 +49,10 @@
         run1 = cr2.Run(name="first")
         run2 = cr2.Run(name="second")
         l = cr2.LinePlot([run1,
-                                  run2],
-                                 [cr2.power.OutPower],
-                                 column=["power"],
-                                 filters={"cdev_state": [1]})
+                          run2],
+                         [cr2.power.OutPower],
+                         column=["power"],
+                         filters={"cdev_state": [1]})
         l.view()
         matplotlib.pyplot.close('all')
 
@@ -81,11 +81,12 @@
         run1 = cr2.Run(name="first")
         run2 = cr2.Run(name="second")
         l = cr2.LinePlot([run1,
-                                  run2],
-                                 [cr2.power.InPower,
-                                  cr2.power.OutPower],
-                                 column="power",
-                                 pivot="cpus")
+                          run2],
+                         [cr2.power.InPower,
+                          cr2.power.OutPower],
+                         column=["dynamic_power",
+                                 "power"],
+                         pivot="cpus")
         l.view()
         matplotlib.pyplot.close('all')
 
@@ -97,7 +98,7 @@
             run1,
             cr2.power.InPower,
             column=[
-                "power",
+                "dynamic_power",
                 "load1"],
             filters={
                 "cdev_state": [