Author: gnichols Date: 2010-08-18 13:34:55 +0000 (Wed, 18 Aug 2010) New Revision: 636

Modified: trunk/tests/cpuscaling/cpuscaling.py Log: 624141 - cpuscaling test fails if available frequencies are listed lowest to highest

Modified: trunk/tests/cpuscaling/cpuscaling.py =================================================================== --- trunk/tests/cpuscaling/cpuscaling.py 2010-08-18 13:32:33 UTC (rev 635) +++ trunk/tests/cpuscaling/cpuscaling.py 2010-08-18 13:34:55 UTC (rev 636) @@ -277,21 +277,24 @@ # 1. Determine if the cpu's support scaling using presense or lack there of ~/cpufreq in sysfs

if not self.getCPUFreqDirectories(): - return False + return False if len (self.cpufreqDirectories) > 1: print "System has %u cpus"% len(self.cpufreqDirectories)

# 2. Check ~/cpu[*]/scaling_available_freq files to ensure that all cpu's scale the same ammount; if not bail freqFileName = "scaling_available_frequencies" - self.frequencies = self.checkParameters(freqFileName) - if not self.frequencies: + frequencies = self.checkParameters(freqFileName) + if not frequencies: return False + # sort them as integers + self.frequencies = map(string.atoi, frequencies) + self.frequencies.sort() +

print "" print "Supported CPU Frequencies: " for freq in self.frequencies: - f = string.atoi(freq)/1000 - print " %u MHz" % f + print " %u MHz" % (freq/1000) print ""

# 3. Check ~/cpu[*]/scaling_available_governors files to verify all cpu's support the same control methods @@ -351,9 +354,9 @@ success = False

# 7. Set the the cpu speed to it's lowest value - frequency = self.frequencies[-1] - print "Setting cpu frequency to %u MHz" % (string.atoi(frequency)/1000) - if not self.setFrequency(frequency): + frequency = self.frequencies[0] + print "Setting cpu frequency to %u MHz" % (frequency/1000) + if not self.setFrequency("%u" % frequency): success = False

# 8. Verify the speed is set to the lowest value by comparing ~/scaling_min_freq to ~/scaling_cur_freq @@ -372,9 +375,9 @@ print "Minumum frequency load test time: %.2f" % self.minimumFrequencyTestTime

# 11. Set the cpu speed to it's highest value as above. - frequency = self.frequencies[0] - print "Setting cpu frequency to %u MHz" % (string.atoi(frequency)/1000) - if not self.setFrequency(frequency): + frequency = self.frequencies[-1] + print "Setting cpu frequency to %u MHz" % (frequency/1000) + if not self.setFrequency("%u" % frequency): success = False

maximumFrequency = self.getParameter("scaling_max_freq")