r737 - trunk/tests/cpuscaling
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-27 14:26:10 +0000 (Thu, 27 Jan 2011)
New Revision: 737
Modified:
trunk/tests/cpuscaling/cpuscaling.py
Log:
488129 - FEAT: hts plan --add command needs to provide test-specific guidance
Modified: trunk/tests/cpuscaling/cpuscaling.py
===================================================================
--- trunk/tests/cpuscaling/cpuscaling.py 2011-01-27 14:23:46 UTC (rev 736)
+++ trunk/tests/cpuscaling/cpuscaling.py 2011-01-27 14:26:10 UTC (rev 737)
@@ -84,6 +84,31 @@
return tests
+ def verify(self):
+ if not self.getLogicalDeviceName():
+ while True:
+ cpuNumber = self.prompt("Please enter the cpu number to be tested:")
+ try:
+ int(cpuNumber)
+ self.setLogicalDeviceName(cpuNumber)
+ self.parameters.set(Constants.DEVICE, cpuNumber)
+ break
+ except ValueError:
+ print "Please enter just the integer cpu number."
+
+ # do a quick test to see if the cpu number is usable
+ cpuDirectories = self.getCPUFreqDirectories()
+ for directory in cpuDirectories:
+ if ("cpu" + self.getLogicalDeviceName()) in directory:
+ return True
+ # otherwise
+ print "Error: there is no cpufreq directory for cpu" + self.getLogicalDeviceName()
+ return False
+
+
+
+
+
def getCPUFreqDirectories(self):
if not os.path.exists(self.sysCPUDirectory):
13 years, 3 months
r736 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-27 14:23:46 +0000 (Thu, 27 Jan 2011)
New Revision: 736
Modified:
trunk/tests/info/info.py
Log:
607976 - sosreport: error: no such option: --no-progressbar
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2011-01-27 14:21:46 UTC (rev 735)
+++ trunk/tests/info/info.py 2011-01-27 14:23:46 UTC (rev 736)
@@ -373,7 +373,7 @@
result = False
while True:
line = pipe.readline()
- if line:
+ if line and not "error: no such option: --no-progressbar" in line:
print line.strip()
sys.stdout.flush()
word = line.split()
13 years, 3 months
r735 - trunk/tests/core
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-27 14:21:46 +0000 (Thu, 27 Jan 2011)
New Revision: 735
Modified:
trunk/tests/core/core.py
Log:
623787 - core test - stress portion should scale for memory size
Modified: trunk/tests/core/core.py
===================================================================
--- trunk/tests/core/core.py 2011-01-27 14:21:05 UTC (rev 734)
+++ trunk/tests/core/core.py 2011-01-27 14:21:46 UTC (rev 735)
@@ -82,17 +82,23 @@
- def run(self):
- FAIL = 1
- PASS = 0
- result = PASS
+ def runCORE2(self):
# run the old CORE2 script
try:
# run script for extra cpu stuff (ia64 and ppc64
if self.redHatRelease.getArch() in ["ia64", "ppc64"]:
core2 = Command("./CORE2")
core2.echo()
-
+ except V7CommandException, e:
+ print "Error:"
+ print e
+ e.command.printErrors()
+ return False
+
+ return True
+
+ def runClockTest(self):
+ try:
# run clock tests - jitter and direction
usingTSC = self.getClockInfo()
if self.isIntel() and not usingTSC:
@@ -105,21 +111,58 @@
clocktest = Command("./clocktest")
clocktest.echo()
sys.stdout.flush()
+ return True
+ except V7CommandException, e:
+ print "Error:"
+ print e
+ e.command.printErrors()
+ return False
+
+ def runStress(self):
+
+ try:
limit = 10 # min.
+ numberOfProcesses = 12
+ processSize = 128 # MB
+ # check memory limits
+ if self.freeMemory < (numberOfProcesses * processSize):
+ processSize = int(self.freeMemory/numberOfProcesses)
+ print "Note: scaling back %u processes at %u MB for memory limit of %u MB" %(numberOfProcesses, processSize, self.freeMemory)
+
print "Running stress for %u min." % limit
sys.stdout.flush()
- stress = Command("stress --cpu 12 --io 12 --vm 12 --vm-bytes 128M --timeout %um" % limit)
+ stress = Command("stress --cpu %u --io %u --vm %u --vm-bytes %uM --timeout %um" % (numberOfProcesses, numberOfProcesses, numberOfProcesses, processSize, limit))
+ print stress.command
stress.echo()
+ return True
except V7CommandException, e:
print "Error:"
print e
e.command.printErrors()
- return FAIL
+ return False
return result
-
+ def run(self):
+ FAIL = 1
+ PASS = 0
+ result = PASS
+ if not self.runSubTest(self.getMemoryInfo, name="Limits", description="Get test parameters based on hardware"):
+ print "Error: could not determine memory limits, using default settings"
+ result = FAIL
+
+ if not self.runSubTest(self.runCORE2, name="CORE2", description="Run CORE2 script for cpu info"):
+ result = FAIL
+
+ if not self.runSubTest(self.runClockTest, name="clocktest", description="Clock tests"):
+ result = FAIL
+
+ if not self.runSubTest(self.runStress, name="Stress"):
+ result = FAIL
+
+ return result
+
if __name__ == "__main__":
test = CoreTest()
returnValue = test.do(sys.argv)
13 years, 3 months
r734 - trunk/tests/memory
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-27 14:21:05 +0000 (Thu, 27 Jan 2011)
New Revision: 734
Modified:
trunk/tests/memory/memory.py
Log:
623787 - core test - stress portion should scale for memory size
Modified: trunk/tests/memory/memory.py
===================================================================
--- trunk/tests/memory/memory.py 2011-01-27 14:19:26 UTC (rev 733)
+++ trunk/tests/memory/memory.py 2011-01-27 14:21:05 UTC (rev 734)
@@ -54,7 +54,7 @@
PASSED = 0
FAILED = 1
- passed = self.runSubTest(self.getTestLimits, name="Limits", description="Get test parameters based on hardware")
+ passed = self.runSubTest(self.getMemoryInfo, name="Limits", description="Get test parameters based on hardware")
if not passed:
return FAILED
@@ -71,57 +71,7 @@
#otherwised, passed
return PASSED
-
- def getTestLimits(self):
-
- self.checkNFSRootFileSystem()
-
- procMeminfo = open("/proc/meminfo", "r")
- self.freeMemory = 0
- self.systemMemory = 0
- self.swapMemory = 0
- while True:
- line = procMeminfo.readline()
- if line:
- tokens = line.split()
- if len(tokens) == 3:
- if "MemTotal:" == tokens[0].strip():
- self.systemMemory = string.atoi(tokens[1].strip())/1024
- elif tokens[0].strip() in ["MemFree:", "Cached:", "Buffers:"]:
- self.freeMemory += string.atoi(tokens[1].strip())
- elif "SwapTotal:" == tokens[0].strip():
- self.swapMemory = string.atoi(tokens[1].strip())/1024
- else:
- break
- procMeminfo.close()
- self.freeMemory = self.freeMemory/1024
- print "System Memory: %u MB" % self.systemMemory
- print "Free Memory: %u MB" % self.freeMemory
- print "Swap Memory: %u MB" % self.swapMemory
-
- if self.systemMemory == 0:
- print "Error: could not determine system RAM"
- return False
-
- # Process Memory
- self.processMemory = self.freeMemory
- self.isProcessLimited = False
- try:
- arch = Command("uname -i").getString()
- if (arch == "i386" or arch == "s390" )and self.freeMemory > 1024:
- self.isProcessLimited = True
- self.processMemory = 1024 # MB, due to 32-bit address space
- print "%s arch, Limiting Process Memory: %u" % (arch, self.processMemory)
- # others? what about PAE kernel?
- except V7CommandException, exception:
- print "Error: could not determine system architecture via uname -i"
- print exception
- return False
- sys.stdout.flush()
- #otherwise
- return True
-
def runSingleProcessTest(self):
if not self.runThreadedMemoryTest():
return False
13 years, 3 months
r733 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-27 14:19:26 +0000 (Thu, 27 Jan 2011)
New Revision: 733
Modified:
trunk/v7/test.py
Log:
623787 - core test - stress portion should scale for memory size
Modified: trunk/v7/test.py
===================================================================
--- trunk/v7/test.py 2011-01-27 14:08:59 UTC (rev 732)
+++ trunk/v7/test.py 2011-01-27 14:19:26 UTC (rev 733)
@@ -466,6 +466,56 @@
print "Done waiting"
sys.stdout.flush()
+ def getMemoryInfo(self):
+
+ self.checkNFSRootFileSystem()
+
+ procMeminfo = open("/proc/meminfo", "r")
+ self.freeMemory = 0
+ self.systemMemory = 0
+ self.swapMemory = 0
+ while True:
+ line = procMeminfo.readline()
+ if line:
+ tokens = line.split()
+ if len(tokens) == 3:
+ if "MemTotal:" == tokens[0].strip():
+ self.systemMemory = string.atoi(tokens[1].strip())/1024
+ elif tokens[0].strip() in ["MemFree:", "Cached:", "Buffers:"]:
+ self.freeMemory += string.atoi(tokens[1].strip())
+ elif "SwapTotal:" == tokens[0].strip():
+ self.swapMemory = string.atoi(tokens[1].strip())/1024
+ else:
+ break
+ procMeminfo.close()
+ self.freeMemory = self.freeMemory/1024
+ print "System Memory: %u MB" % self.systemMemory
+ print "Free Memory: %u MB" % self.freeMemory
+ print "Swap Memory: %u MB" % self.swapMemory
+
+ if self.systemMemory == 0:
+ print "Error: could not determine system RAM"
+ return False
+
+ # Process Memory
+ self.processMemory = self.freeMemory
+ self.isProcessLimited = False
+ try:
+ arch = Command("uname -i").getString()
+ if (arch == "i386" or arch == "s390" )and self.freeMemory > 1024:
+ self.isProcessLimited = True
+ self.processMemory = 1024 # MB, due to 32-bit address space
+ print "%s arch, Limiting Process Memory: %u" % (arch, self.processMemory)
+ # others? what about PAE kernel?
+ except V7CommandException, exception:
+ print "Error: could not determine system architecture via uname -i"
+ print exception
+ return False
+ sys.stdout.flush()
+
+ #otherwise
+ return True
+
class TestParameters:
def __init__(self):
13 years, 3 months
r732 - trunk/tests/network
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-27 14:08:59 +0000 (Thu, 27 Jan 2011)
New Revision: 732
Modified:
trunk/tests/network/network.py
Log:
627043 - HWCert: RedHat v7-1.2-16 network test on sit0 interface fails
Modified: trunk/tests/network/network.py
===================================================================
--- trunk/tests/network/network.py 2011-01-25 15:29:41 UTC (rev 731)
+++ trunk/tests/network/network.py 2011-01-27 14:08:59 UTC (rev 732)
@@ -58,7 +58,7 @@
self.priority = 2 # set priority high so it runs before longer tests
self.isNFSRootSystem = False
self.deviceClass = DeviceClass.network_interface
- self.ignoreInterfaces = re.compile("lo|peth\d+|virbr\d+|vif\d+.\d+|xenbr\d+|wmaster\d+")
+ self.ignoreInterfaces = re.compile("lo|peth\d+|virbr\d+|vif\d+.\d+|xenbr\d+|wmaster\d+|sit\d+")
self.environment = Environment()
def tags(self):
13 years, 3 months
r731 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-25 15:29:41 +0000 (Tue, 25 Jan 2011)
New Revision: 731
Modified:
trunk/Makefile
Log:
R7
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-01-21 14:27:45 UTC (rev 730)
+++ trunk/Makefile 2011-01-25 15:29:41 UTC (rev 731)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 6
+V7_RELEASE := 7
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
13 years, 3 months
r730 - in tags: . v7-V1-3R6/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-21 14:27:45 +0000 (Fri, 21 Jan 2011)
New Revision: 730
Added:
tags/v7-V1-3R6/
tags/v7-V1-3R6/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R6 (from rev 729, trunk)
Copied: tags/v7-V1-3R6/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R6/v7/version.py (rev 0)
+++ tags/v7-V1-3R6/v7/version.py 2011-01-21 14:27:45 UTC (rev 730)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '6'
+rhel_version = '5'
13 years, 3 months
r729 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-21 14:27:13 +0000 (Fri, 21 Jan 2011)
New Revision: 729
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-01-21 14:22:39 UTC (rev 728)
+++ trunk/v7.spec.in 2011-01-21 14:27:13 UTC (rev 729)
@@ -69,6 +69,19 @@
/etc/init.d/v7
%changelog
+* Thu Jan 20 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R6
+
+ 670989 - test fails with a traceback when saving test log
+ 589806 - 1.1-23 man page says it's version 1.0-21
+ 617646 - print --report full does not show guest logs/results for fv_* tests
+ 640138 - CPUSCALING fails with traceback on non-repeatable performance test loads
+ 516910 - FEAT: v7 needs a wlan-specific test
+ 668041 - v7 virtualization tests should log image meta-data
+ 589425 - Please return the minor RHEL version back in info output
+ 654960 - info test reports a pass even though kernel validation fails.
+
* Fri Jan 14 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R4
13 years, 3 months
r728 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-01-21 14:22:39 +0000 (Fri, 21 Jan 2011)
New Revision: 728
Modified:
trunk/v7/test.py
Log:
654960 - info test reports a pass even though kernel validation fails.
Modified: trunk/v7/test.py
===================================================================
--- trunk/v7/test.py 2011-01-21 14:20:44 UTC (rev 727)
+++ trunk/v7/test.py 2011-01-21 14:22:39 UTC (rev 728)
@@ -409,7 +409,16 @@
def runSubTest(self, subtestFunction, name, description=None):
self.markOutput(name, description)
- result = subtestFunction()
+ sys.stdout.flush()
+ sys.stderr.flush()
+ try:
+ result = subtestFunction()
+ except Exception, exception:
+ print "Error: Subtest raised unhandled exception:"
+ print exception
+ result = False
+ sys.stdout.flush()
+ sys.stderr.flush()
self.markSummary(result)
self.closeOutput()
return result
13 years, 3 months