commit d721b27ead40c39efa1f1febdd853f9b04c54984
author Javi Merino <javi.merino@arm.com> Mon Apr 20 15:37:53 2015 +0100
committer Javi Merino <javi.merino@arm.com> Wed Aug 12 16:03:46 2015 +0100
tree d8c9df57e4ea8d0a7440159e646dcd93066b1455
parent cad13884bb4cd1c3d6c5d01a4716677e066634a3

tests: new thermal trace data

We now have trace for devfreq cooling, for the gpu, so get new trace
data that contains it.  Fix the tests that broke because of the new
data.

Change-Id: I9e0e7e575fa69e40a8811f6979f9f50f5ff71106

tests/test_power.py

diff --git a/tests/test_power.py b/tests/test_power.py
index f2d9a45..989ff9a 100644
--- a/tests/test_power.py
+++ b/tests/test_power.py
@@ -10,7 +10,7 @@
 class TestPower(BaseTestThermal):
     def __init__(self, *args, **kwargs):
         super(TestPower, self).__init__(*args, **kwargs)
-        self.map_label = {"000000f0": "A15", "0000000f": "A7"}
+        self.map_label = {"00000000,00000039": "A53", "00000000,00000006": "A57"}
 
     def test_pivot_with_labels(self):
         """Test pivot_with_labels()"""
@@ -29,22 +29,22 @@
         """Test that OutPower() creates a proper data_frame"""
         outp = cr2.Run().out_power
 
-        self.assertEquals(outp.data_frame["power"].iloc[0], 2429)
+        self.assertEquals(outp.data_frame["power"].iloc[0], 1344)
         self.assertTrue("cdev_state" in outp.data_frame.columns)
 
     def test_outpower_get_all_freqs(self):
         """Test OutPower.get_all_freqs()"""
         dfr = cr2.Run().out_power.get_all_freqs(self.map_label)
 
-        self.assertEquals(dfr["A15"].iloc[0], 1000)
-        self.assertEquals(dfr["A7"].iloc[1], 1600)
+        self.assertEquals(dfr["A57"].iloc[0], 1100)
+        self.assertEquals(dfr["A53"].iloc[1], 850)
 
     def test_inpower_get_dataframe(self):
         """Test that InPower() creates a proper data_frame()"""
         inp = cr2.Run().in_power
 
         self.assertTrue("load0" in inp.data_frame.columns)
-        self.assertEquals(inp.data_frame["load0"].iloc[0], 100)
+        self.assertEquals(inp.data_frame["load0"].iloc[0], 24)
 
     def test_inpower_big_cpumask(self):
         """InPower()'s data_frame is not confused by 64-bit cpumasks"""
@@ -87,14 +87,14 @@
         """Test InPower.get_all_freqs()"""
         dfr = cr2.Run().in_power.get_all_freqs(self.map_label)
 
-        self.assertEquals(dfr["A15"].iloc[0], 1100)
-        self.assertEquals(dfr["A7"].iloc[1], 1500)
-        self.assertEquals(dfr["A15"].iloc[5], 1100)
+        self.assertEquals(dfr["A57"].iloc[0], 1100)
+        self.assertEquals(dfr["A53"].iloc[1], 850)
+        self.assertEquals(dfr["A57"].iloc[5], 1100)
 
     def test_inpower_get_load_data(self):
         """Test InPower.get_load_data()"""
         load_data = cr2.Run().in_power.get_load_data(self.map_label)
 
-        self.assertEquals(load_data["A15"].iloc[0], 100 + 100 + 100 + 100)
-        self.assertEquals(load_data["A7"].iloc[3], 100 + 100 + 100 + 100)
-        self.assertEquals(load_data["A15"].iloc[0], load_data["A15"].iloc[1])
+        self.assertEquals(load_data["A57"].iloc[0], 24 + 19)
+        self.assertEquals(load_data["A53"].iloc[3], 32 + 28 + 46 + 44)
+        self.assertEquals(load_data["A57"].iloc[0], load_data["A57"].iloc[1])