thermal: don't depend on a trailing space in the trace

The test data we had had one for the trace_printk, but not for the
other functions.  That's wrong so fix the code and test cases.

3 files changed, 4 insertions, 3 deletions

diff --git a/tests/test_power.py b/tests/test_power.py
index eb097f2..8c952d1 100644
--- a/tests/test_power.py
+++ b/tests/test_power.py
@@ -13,4 +13,5 @@ class TestPower(TestThermalBase):
         df = power.Power().get_data_frame()
 
         self.assertEquals(df["freq"][0], 800000)
+        self.assertEquals(df["power"][0], 0)
         self.assertTrue("cdev_state" in df.columns)
diff --git a/tests/test_thermal.py b/tests/test_thermal.py
index bed4825..d366db7 100644
--- a/tests/test_thermal.py
+++ b/tests/test_thermal.py
@@ -39,11 +39,11 @@ class TestThermal(TestThermalBase):
 
     def test_get_thermal_csv(self):
         thermal.Thermal().write_thermal_csv()
-        first_data_line = "267.525370,0,1244,144,1388,0,0,0,0,50000,7000\n"
+        first_data_line = "164.990777,0,1244,143,1387,0,0,0,0,50000,7000\n"
 
         with open("thermal.csv") as f:
             first_line = f.readline()
-            self.assertTrue(first_line.startswith("time,Pa7_in"))
+            self.assertTrue(first_line.startswith("time,Pgpu_in"))
 
             second_line = f.readline()
             self.assertEquals(second_line, first_data_line)
@@ -54,7 +54,7 @@ class TestThermal(TestThermalBase):
         self.assertEquals(df["currT"][0], 50000)
         self.assertTrue("Ptot_out" in df.columns)
         self.assertFalse("time" in df.columns)
-        self.assertEquals(len(df), 3)
+        self.assertEquals(len(df), 5)
 
     def test_plot_temp(self):
         """Test plot_temp()
diff --git a/tests/trace.dat b/tests/trace.dat
index cd00b6f..870cec7 100644
--- a/tests/trace.dat
+++ b/tests/trace.dat