Merge lp:~brendan-donegan/checkbox/bug999547_frequency_governors_speedup into lp:checkbox

[Brendan Donegan]

Because the difference between expected and actual speedup was being passed through the abs() function, the logic was failing the test even if the actual speedup was greater than the expected speedup. The abs() call has been removed so that if this is the case, the 'difference' value will be negative and the test will not fail.

[Zygmunt Krynicki (zyga)]

Looks good, +1

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-11 19:30:27 +0000
+++ debian/changelog	2012-09-12 07:44:18 +0000
@@ -74,6 +74,9 @@
     on them (LP: #1043144)
   * Remove default value from windows_number argument since the logic following
     it dictates that it's only valid for certain tests (LP: #1047621)
+  * scripts/frequency_governors_test - Ensure that check for difference in
+    expected and actual speedup only fails if the actual speedup is less than
+    the expected speedup (LP: #999547)
 
   [Sylvain Pineau]
   * jobs/suspend.txt.in: Fixed suspend/suspend_advanced dependencies to avoid

=== modified file 'scripts/frequency_governors_test'
--- scripts/frequency_governors_test	2012-07-05 16:45:00 +0000
+++ scripts/frequency_governors_test	2012-09-12 07:44:18 +0000
@@ -417,13 +417,16 @@
                                    / self.maximumFrequencyTestTime)
                 logging.info("CPU Frequency Speed Up: %.2f" % predictedSpeedup)
                 logging.info("Measured Speed Up: %.2f" % measuredSpeedup)
-                differenceSpeedUp = ((abs(measuredSpeedup - predictedSpeedup)
-                                     / predictedSpeedup) * 100)
+                differenceSpeedUp = (((measuredSpeedup - predictedSpeedup) / predictedSpeedup) * 100)
                 logging.info("Percentage Difference %.1f%%" % differenceSpeedUp)
                 if differenceSpeedUp > self.speedUpTolerance:
                     logging.error("Measured speedup vs expected speedup is %.1f%% and is not within %.1f%% margin."
                            % (differenceSpeedUp, self.speedUpTolerance))
                     success = False
+                elif differenceSpeedUp < 0:
+                    logging.info("""
+                                 Measured speed up %.2f exceeded expected speedup %.2f
+                                 """ % (measuredSpeedup, predictedSpeedup))
             else:
                 logging.error("Not enough timing data to calculate speed differences.")