r632 - trunk/tests/cpuscaling
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-12 16:00:49 +0000 (Thu, 12 Aug 2010)
New Revision: 632
Modified:
trunk/tests/cpuscaling/cpuscaling.py
Log:
619712 - V7 plan traceback in cpuscaling for s390x RHEL6 and ppc64 RHEL6
Modified: trunk/tests/cpuscaling/cpuscaling.py
===================================================================
--- trunk/tests/cpuscaling/cpuscaling.py 2010-08-12 15:58:43 UTC (rev 631)
+++ trunk/tests/cpuscaling/cpuscaling.py 2010-08-12 16:00:49 UTC (rev 632)
@@ -101,9 +101,6 @@
if not self.cpufreqDirectories:
self.cpufreqDirectories = list()
self.cpufreqDirectories.append(cpufreqDirectory)
- if len(self.cpufreqDirectories) is 0:
- return None
- # otherwise
return self.cpufreqDirectories
def checkParameters(self, file):
13 years, 9 months
r631 - trunk/tests/audio
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-12 15:58:43 +0000 (Thu, 12 Aug 2010)
New Revision: 631
Modified:
trunk/tests/audio/audio.py
Log:
608535 - rhel6 audio test failed - sound-sample.wav: No such file or directory
Modified: trunk/tests/audio/audio.py
===================================================================
--- trunk/tests/audio/audio.py 2010-08-12 15:56:09 UTC (rev 630)
+++ trunk/tests/audio/audio.py 2010-08-12 15:58:43 UTC (rev 631)
@@ -40,10 +40,10 @@
def getRequiredRPMs(self):
rpms = ["sox"]
redhat = RedHatRelease()
- if "Fedora" in redhat.getProduct() or ("Red Hat" in redhat.getProduct() and redhat.getVersion() is 6):
- pass # need to find system-config-soundcard
+ if "Fedora" in redhat.getProduct() or ("Red Hat" in redhat.getProduct() and redhat.getVersion() >= 6):
+ rpms.append("alsa-utils") # for sound samples in /usr/share/sounds/alsa
else:
- rpms.append("system-config-soundcard")
+ rpms.append("system-config-soundcard") # for sound samples in /usr/share/system-config-soundcard
return rpms
def logSoundCardInfo(self):
@@ -80,13 +80,17 @@
self.result = Constants.FAIL
return FAILED
- waveFile="/usr/share/system-config-soundcard/sound-sample.wav";
+ waveFiles=["/usr/share/system-config-soundcard/sound-sample.wav",
+ "/usr/share/sounds/alsa/Front_Right.wav",
+ "/usr/share/sounds/alsa/Front_Left.wav"]
recordedWaveFile="./test.wav"
print "starting recording"
- if not os.system("play %s &" % waveFile) is 0:
- print "Error: play command failed"
- self.result = Constants.FAIL
- return FAILED
+ for waveFile in waveFiles:
+ if os.path.exists(waveFile):
+ if not os.system("play %s &" % waveFile) is 0:
+ print "Error: play command failed"
+ self.result = Constants.FAIL
+ return FAILED
if not os.system("rec -r 44100 %s &" % recordedWaveFile) is 0:
print "Error: record command failed"
self.result = Constants.FAIL
@@ -96,10 +100,7 @@
print "Waiting %d sec" % waitTime
sys.stdout.flush()
time.sleep(waitTime)
- if not os.system("killall -w -9 rec sox") is 0:
- print "Error: kill failed"
- self.result = Constants.FAIL
- return FAILED
+ os.system("killall -w -9 rec sox")
if self.getMode() == Constants.normal and not self.promptConfirm("Did you hear the sound?"):
self.result = Constants.FAIL
13 years, 9 months
r630 - trunk/tests/core
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-12 15:56:09 +0000 (Thu, 12 Aug 2010)
New Revision: 630
Modified:
trunk/tests/core/clocktest.c
Log:
621041 - core test failed on s390x RHEL6 - sched_setaffinity: Invalid argument
Modified: trunk/tests/core/clocktest.c
===================================================================
--- trunk/tests/core/clocktest.c 2010-08-12 15:54:46 UTC (rev 629)
+++ trunk/tests/core/clocktest.c 2010-08-12 15:56:09 UTC (rev 630)
@@ -28,10 +28,14 @@
unsigned slow_cpu, fast_cpu;
double jitter;
double largest_jitter = 0.0;
- unsigned cpu, num_cpus, iter;
+ unsigned cpu, num_cpus, iter, conf_cpus;
int failures = 0;
- num_cpus = sysconf(_SC_NPROCESSORS_CONF);
+ conf_cpus = sysconf(_SC_NPROCESSORS_CONF);
+ num_cpus = sysconf(_SC_NPROCESSORS_ONLN);
+ if (num_cpus != conf_cpus){
+ printf("Warning: %u cpus are online, but %u cpus are configured.\n", num_cpus, conf_cpus);
+ }
if (num_cpus == 1) {
printf("Single CPU detected. No clock jitter testing necessary.\n");
return 0;
13 years, 9 months
r629 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-12 15:54:46 +0000 (Thu, 12 Aug 2010)
New Revision: 629
Modified:
trunk/Makefile
Log:
R16
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-08-12 15:52:53 UTC (rev 628)
+++ trunk/Makefile 2010-08-12 15:54:46 UTC (rev 629)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.2
-V7_RELEASE := 15
+V7_RELEASE := 16
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, 9 months
r628 - trunk/tests/memory
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-12 15:52:53 +0000 (Thu, 12 Aug 2010)
New Revision: 628
Modified:
trunk/tests/memory/threaded_memtest.c
Log:
581463 - memory test hangs on larger scale systems
Modified: trunk/tests/memory/threaded_memtest.c
===================================================================
--- trunk/tests/memory/threaded_memtest.c 2010-08-06 01:50:03 UTC (rev 627)
+++ trunk/tests/memory/threaded_memtest.c 2010-08-12 15:52:53 UTC (rev 628)
@@ -157,8 +157,10 @@
pthread_mutex_unlock(&ct_mutex);
if (parallel) {
/* let main() go as soon as the thread is created */
+ pthread_mutex_lock(&mmap_mutex);
mmap_done=1;
pthread_cond_signal(&mmap_cond);
+ pthread_mutex_unlock(&mmap_mutex);
}
on_cpu(thread_id % num_cpus);
13 years, 9 months
r627 - in tags: . v7-V1-2R15/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-06 01:50:03 +0000 (Fri, 06 Aug 2010)
New Revision: 627
Added:
tags/v7-V1-2R15/
tags/v7-V1-2R15/v7/version.py
Log:
tag version
Copied: tags/v7-V1-2R15 (from rev 626, trunk)
Copied: tags/v7-V1-2R15/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-2R15/v7/version.py (rev 0)
+++ tags/v7-V1-2R15/v7/version.py 2010-08-06 01:50:03 UTC (rev 627)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.2'
+release = '15'
+rhel_version = '5'
13 years, 9 months
r626 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-06 01:48:05 +0000 (Fri, 06 Aug 2010)
New Revision: 626
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2010-08-06 01:46:05 UTC (rev 625)
+++ trunk/v7.spec.in 2010-08-06 01:48:05 UTC (rev 626)
@@ -69,6 +69,17 @@
/etc/init.d/v7
%changelog
+* Tue Aug 03 2010 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.2 R15
+
+ 606963 - Storage test fail on RH6 certification
+ 621056 - v7 failed after reboot test
+ 621614 - systems with no cpuscaling show errors about cpufreq directories
+ 621348 - core test calls "tree" for ppc64, which is not in required rpms.
+ 620918 - Reboot test fails, causes kernel panic with timeout set to zero.
+ 586941 - v7 on RHEL6 requires rpms not in RHEL6: system-config-display
+
* Fri Jul 30 2010 Greg Nichols <gnichols(a)redhat.com>
V7 1.2 R14
13 years, 9 months
r625 - trunk/tests/video
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-06 01:46:05 +0000 (Fri, 06 Aug 2010)
New Revision: 625
Modified:
trunk/tests/video/video.py
Log:
586941 - v7 on RHEL6 requires rpms not in RHEL6: system-config-display
Modified: trunk/tests/video/video.py
===================================================================
--- trunk/tests/video/video.py 2010-08-06 01:36:10 UTC (rev 624)
+++ trunk/tests/video/video.py 2010-08-06 01:46:05 UTC (rev 625)
@@ -14,16 +14,13 @@
# Author: Irina Boverman
#
-import os
-import sys
-import string
-import commands
-import shutil
+import os, re, sys, string, commands, shutil
# sys.path.append("/home/gnichols/devel/v7")
from v7.test import Test
from v7.command import Command, V7CommandException
from v7.tags import DeviceClass
+from v7.redhatrelease import RedHatRelease
FAILED = 1
PASSED = 0
@@ -57,6 +54,7 @@
self.runOn = "pci.device_subclass == 0 and pci.device_class == 3 "
self.requires = ""
self.deviceClass = DeviceClass.display
+ self.redHatRelease = RedHatRelease()
def plan(self, devices):
# HAL discovery
@@ -71,36 +69,67 @@
return tests
def getRequiredRPMs(self):
- return ["xorg-x11-apps", "system-config-display"]
+ rpms = ["xorg-x11-apps"]
+ if "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() < 6:
+ rpms.append("system-config-display") # for system-config-display
+ else:
+ rpms.append("xorg-x11-server-Xorg") # for X
+ rpms.append("xorg-x11-xinit") # for startx
+ return rpms
def settool(self):
# Adapt for tool name changes
- (status, self.Xconfig_tool) = commands.getstatusoutput("rpm -q system-config-display > /dev/null && " +
+ if "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() < 6:
+ (status, self.Xconfig_tool) = commands.getstatusoutput("rpm -q system-config-display > /dev/null && " +
"echo system-config-display || " +
"echo redhat-config-xfree86")
- if status != 0:
- print "FAILED video setup"
- return status
+ if status != 0:
+ print "Error: could not locate X configuration tool"
+ return False
+ else:
+ self.Xconfig_tool = None
+
+ return True
def getfile(self):
- status = os.system(self.Xconfig_tool + " -o " + self.Xconfigfile + " --noui > /dev/null")
- if status != 0:
- print "FAILED to obtain config file"
- return status
+ if self.Xconfig_tool:
+ status = os.system(self.Xconfig_tool + " -o " + self.Xconfigfile + " --noui > /dev/null")
+ if status != 0:
+ print "Error: could not obtain config file"
+ return False
+ else: # check the log
+ self.Xconfigfile = None
+ logPath = "/var/log/Xorg.0.log"
+ if os.path.exists(logPath):
+ log = open(logPath)
+ pattern = re.compile("\(==\) Using config file: \"(?P<filepath>[^\"]+)\"")
+ for line in log.readlines():
+ match = pattern.search(line)
+ if match:
+ self.Xconfigfile = match.group("filepath")
+ print "Using config file " + self.Xconfigfile
+ break
+ log.close()
+ if not self.Xconfigfile:
+ print "No config file found - using Default Config"
+ return True
def setdepth(self):
- (status, self.depth) = commands.getstatusoutput("grep DefaultDepth " + self.Xconfigfile +
+ if self.Xconfigfile:
+ (status, self.depth) = commands.getstatusoutput("grep DefaultDepth " + self.Xconfigfile +
" | awk ' { print $2; } '")
- if status != 0:
- print "FAILED to obtain DefaultDepth"
- return status
- try:
- self.depth = int(self.depth)
- except:
- print "FAILED to obtain depth"
- status = 1
- return status
+ if status != 0:
+ print "Error: could not obtain default depth from config file"
+ return False
+ try:
+ self.depth = int(self.depth)
+ print "Depth set to %u" % self.depth
+ except:
+ print "Error: could not convert depth %s to integer" % self.depth
+ self.depth = None
+ return False
+ return True
def setflag(self):
# Adapt for flag changes
@@ -108,17 +137,30 @@
"echo -xf86config || echo -config")
if status != 0:
print "FAILED to obtain config flag"
- return status
+ return False
+ print "Depth flag: " + self.Xconfig_flag
+ return True
def startx(self):
try: os.remove(self.tmpFile)
- except: None
-
- status = os.system("startx ./x11perftest -- :2 %s %s -depth %s &> /dev/null" % (
- self.Xconfig_flag, self.Xconfigfile,
- str(self.depth)
- ))
+ except: pass
+ startxCommand = "startx ./x11perftest -- :2 "
+ if self.Xconfigfile:
+ startxCommand += "%s %s " % (self.Xconfig_flag, self.Xconfigfile)
+ if self.depth:
+ startxCommand += "-depth %u " % self.depth
+
+ try:
+ print "Running: " + startxCommand
+ startx = Command(startxCommand + " &> /dev/null")
+ startx.echo()
+ except V7CommandException, e:
+ print "Error: startx failed;"
+ print e
+ print startx.printErrors()
+ return False
+
# copy the x11perf log into the output file
if os.path.exists("/var/log/Xorg.0.log"):
shutil.copy("/var/log/Xorg.0.log", ".")
@@ -134,27 +176,27 @@
else:
break
xlog.close();
-
- if status != 0:
- print "FAILED to execute startx"
- return status
+ return True
def xstatus(self):
- resultFile = open(self.tmpFile)
- result = 1 # error
- while 1:
- line = resultFile.readline()
- if line:
- result = string.atoi(line)
- else:
- break
- resultFile.close()
- if result is not 0:
- sys.stdout.write("Error: ")
- print "x11perf returned %d" % result
- return result
-
+ try:
+ resultFile = open(self.tmpFile)
+ result = 1 # error
+ while 1:
+ line = resultFile.readline()
+ if line:
+ result = string.atoi(line)
+ else:
+ break
+ resultFile.close()
+ if result is not 0:
+ sys.stdout.write("Error: x11perf returned %d" % result)
+ return False
+ except IOError:
+ print "Error: x11perf did not run"
+ return False
+ return True
def checkDepthAndResolution(self):
success = True
# try to get the current screen resolution and color depth first
@@ -229,21 +271,21 @@
# print "\nError: no displays connected"
print e
# return FAILED
- return PASSED
+
+ return True
def run(self):
print "Starting video test"
- status = FAILED
- result = "FAILED"
- if (self.checkConnections() == PASSED and self.settool() == PASSED and self.getfile() == PASSED and
- self.setdepth() == PASSED and self.setflag() == PASSED and
- self.startx() == PASSED and self.xstatus() == PASSED and
+ result = FAILED
+ if (self.checkConnections() and self.settool() and self.getfile() and
+ self.setdepth() and self.setflag() and self.startx() and self.xstatus() and
self.checkDepthAndResolution()):
self.logDriverInfo()
- status = PASSED
- result = "passed"
- print "Video test on device %s %s" % (self.interface, result)
- return status
+ result = PASSED
+ print "Video test on device %s passed." % (self.interface)
+ else:
+ print "Video test on device %s FAILED." % (self.interface)
+ return result
if __name__ == "__main__":
videoTest = VideoTest()
13 years, 9 months
r624 - trunk/tests/core
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-06 01:36:10 +0000 (Fri, 06 Aug 2010)
New Revision: 624
Modified:
trunk/tests/core/core.py
Log:
621348 - core test calls tree for ppc64, which is not in required rpms.
Modified: trunk/tests/core/core.py
===================================================================
--- trunk/tests/core/core.py 2010-08-06 01:32:42 UTC (rev 623)
+++ trunk/tests/core/core.py 2010-08-06 01:36:10 UTC (rev 624)
@@ -28,6 +28,12 @@
Test.__init__(self, name="core")
self.deviceClass = DeviceClass.processor
self.redHatRelease = RedHatRelease()
+
+ def getRequiredRPMs(self):
+ rpms = list()
+ if "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() >= 6 and self.redHatRelease.getArch() == "ppc64":
+ rpms.append("tree") # for tree command
+ return rpms
def getClockInfo(self):
print "Clock Info: ------------------------------------------"
13 years, 9 months
r623 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-08-06 01:32:42 +0000 (Fri, 06 Aug 2010)
New Revision: 623
Modified:
trunk/v7/test.py
Log:
621056 - v7 failed after reboot test
Modified: trunk/v7/test.py
===================================================================
--- trunk/v7/test.py 2010-08-06 01:32:17 UTC (rev 622)
+++ trunk/v7/test.py 2010-08-06 01:32:42 UTC (rev 623)
@@ -13,12 +13,13 @@
#
# Author: Greg Nichols
#
-import string, os, sys, copy, commands
+import string, os, sys, copy, commands, time
from v7.tags import Constants
from v7.commandLineUI import CommandLineUI
from v7.hal import Hal
+from v7.command import Command, V7CommandException
class Test(CommandLineUI):
@@ -436,4 +437,38 @@
def runOnServer(self, args, outFile):
outFile.write("Server side test for %s not implemented\n" % self.Name())
+ def getLoadAvg(self):
+ loadAvgFile = "/proc/loadavg"
+ if os.path.exists(loadAvgFile):
+ file = open(loadAvgFile)
+ line = file.readline()
+ if len(line.strip()) > 0:
+ params = line.strip().split()
+ loadAvg = float(params[0])
+ print "Current load average: %s" % loadAvg
+ sys.stdout.flush
+ return loadAvg
+ else:
+ return 0
+
+
+ def syncDisks(self):
+ try:
+ command = Command("/bin/sync")
+ command.echo()
+ except V7CommandException, e:
+ print "Warning: v7 attempt to sync failed"
+ print e
+
+
+ def waitForLull(self):
+ waitTime = 5
+ retryLimit = 20
+
+ self.syncDisks()
+
+ retryCount = 0
+ while self.getLoadAvg() > 1 and retryCount < retryLimit:
+ time.sleep(waitTime)
+ retryCount = retryCount + 1
13 years, 9 months