r821 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 18:40:54 +0000 (Wed, 16 Mar 2011)
New Revision: 821
Modified:
trunk/Makefile
Log:
R19
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-03-16 18:39:55 UTC (rev 820)
+++ trunk/Makefile 2011-03-16 18:40:54 UTC (rev 821)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 18
+V7_RELEASE := 19
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, 2 months
r820 - trunk/test-env/www/cgi
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 18:39:55 +0000 (Wed, 16 Mar 2011)
New Revision: 820
Modified:
trunk/test-env/www/cgi/Makefile
Log:
httpd network test
Modified: trunk/test-env/www/cgi/Makefile
===================================================================
--- trunk/test-env/www/cgi/Makefile 2011-03-16 00:15:28 UTC (rev 819)
+++ trunk/test-env/www/cgi/Makefile 2011-03-16 18:39:55 UTC (rev 820)
@@ -28,6 +28,7 @@
rm -rf $(DESTDIR)/var/v7/cgi
mkdir -p $(DESTDIR)/var/v7/cgi
mkdir -p $(DESTDIR)/var/v7/store
+ chmod go+w $(DESTDIR)/var/v7/store
for file in $(FILES); do cp -f $$file $(DESTDIR)/var/v7/cgi/$$file; done
for i in $(SUBDIRS); do $(MAKE) -C $$i V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done
mkdir -p $(DESTDIR)/etc/httpd/conf.d
13 years, 2 months
r819 - in tags: . v7-V1-3R18/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 00:15:28 +0000 (Wed, 16 Mar 2011)
New Revision: 819
Added:
tags/v7-V1-3R18/
tags/v7-V1-3R18/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R18/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R18/v7/version.py (rev 0)
+++ tags/v7-V1-3R18/v7/version.py 2011-03-16 00:15:28 UTC (rev 819)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '18'
+rhel_version = '6'
13 years, 2 months
r818 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 00:11:41 +0000 (Wed, 16 Mar 2011)
New Revision: 818
Modified:
trunk/v7.spec.in
Log:
626970 - FEAT: kdump test needs to verify kdump
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-03-16 00:07:25 UTC (rev 817)
+++ trunk/v7.spec.in 2011-03-16 00:11:41 UTC (rev 818)
@@ -28,7 +28,7 @@
Obsoletes: hts
Requires: lmbench, dt, httpd, nfs-utils, stress, gcc, PyXML, rpm-build
-Requires: dbus-python, kernel-devel, kernel-headers, python-lxml
+Requires: dbus-python, kernel-devel, kernel-headers, python-lxml, kernel-debuginfo
@@ -71,6 +71,10 @@
%changelog
* Fri Mar 11 2011 Greg Nichols <gnichols(a)redhat.com>
+V7 1.3 R18
+ 678949 - oprofiled did not start on Nehalem-EX platform
+ 682115 - RHEL 6.1 fv tests fail on spurious stderr output
+
V7 1.3 R17
626970 - FEAT: kdump test needs to verify kdump
682969 - v7 certify test have no return value
13 years, 2 months
r817 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 00:07:25 +0000 (Wed, 16 Mar 2011)
New Revision: 817
Modified:
trunk/v7/command.py
Log:
682115 - RHEL 6.1 fv tests fail on spuriou stderr output of virt-install and kpartx
Modified: trunk/v7/command.py
===================================================================
--- trunk/v7/command.py 2011-03-16 00:07:15 UTC (rev 816)
+++ trunk/v7/command.py 2011-03-16 00:07:25 UTC (rev 817)
@@ -66,7 +66,7 @@
def _checkErrors(self):
if self.errors and len(self.errors) > 0:
- raise V7CommandException(self, "has output on stderr")
+ raise V7CommandErrorOutput(self)
if self.returnValue != 0 or self.signal != 0:
# if error returned, show stdout whether echo or run was called
if self.output:
@@ -75,9 +75,9 @@
sys.stdout.write("\n")
sys.stdout.flush()
if self.returnValue != 0:
- raise V7CommandException(self, "returned %d" % self.returnValue)
+ raise V7CommandErrorReturned(self, self.returnValue)
if self.signal != 0:
- raise V7CommandException(self, "was killed, signal %d" % self.signal)
+ raise V7CommandErrorKilled(self, self.signal)
def run(self):
""" This method runs the command to produce an action. Any output
@@ -234,6 +234,17 @@
# otherwise, command never started
raise V7CommandException(self.command, "call to poll() before start()")
+
+# V7 Command Exceptions:
+# These exceptions are organized in a type hierarch to allow different levels of exceptions
+# to be caught and handled:
+#
+# V7CommandException - all exceptions raised by Command
+# V7CommandError - commands that either returned non-zero, or were killed
+# V7CommandErrorReturned - commands that returned non-zero
+# V7CommandErrorKilled - commands that were killed via signal
+# V7CommandErrorOutput - commands that had output on stderr
+
class V7CommandException(Exception):
def __init__(self, command, message):
@@ -250,8 +261,23 @@
def _set_message(self, value): self.__message = value
message = property(_get_message, _set_message)
-
+class V7CommandErrorOutput(V7CommandException):
+ def __init__(self, command):
+ V7CommandException.__init__(self, command, "has output on stderr")
+
+class V7CommandError(V7CommandException):
+ def __init__(self, command, message):
+ V7CommandException.__init__(self, command, message)
+
+class V7CommandErrorReturned(V7CommandError):
+ def __init__(self, command, returnValue):
+ V7CommandError.__init__(self, command, "returned %d" % returnValue)
+
+class V7CommandErrorKilled(V7CommandError):
+ def __init__(self, command, signal):
+ V7CommandError.__init__(self, command, "signal %d" % signal)
+
def unitTest():
result = True
try:
13 years, 2 months
r816 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 00:07:15 +0000 (Wed, 16 Mar 2011)
New Revision: 816
Modified:
trunk/v7/fvtest.py
Log:
682115 - RHEL 6.1 fv tests fail on spuriou stderr output of virt-install and kpartx
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2011-03-16 00:03:52 UTC (rev 815)
+++ trunk/v7/fvtest.py 2011-03-16 00:07:15 UTC (rev 816)
@@ -30,7 +30,7 @@
from v7.tags import Constants, DeviceClass, Tags, TestTag
from v7.hal import Hal
from v7.device import Device
-from v7.command import Command, V7CommandException
+from v7.command import Command, V7CommandException, V7CommandError, V7CommandErrorOutput
from v7.environment import Environment
from v7.certificationtest import CertificationDocument
from v7.redhatrelease import RedHatRelease
@@ -286,7 +286,11 @@
print "Using loopback device " + self.loopBackDevice + " for guest data image"
loop = os.path.basename(self.loopBackDevice)
Command("losetup " + self.loopBackDevice + " " + os.path.join(self.guestImageDirectory, self.dataImageFile)).echo()
- Command("kpartx -av " + self.loopBackDevice).echo()
+ try:
+ Command("kpartx -av " + self.loopBackDevice).echo()
+ except V7CommandErrorOutput, exception:
+ print "Warning: %s" % exception
+ exception.command.printErrors()
partition = Command("ls /dev/mapper").getString(regex="%sp[0-9]" % loop, singleLine=False)
Command("mount /dev/mapper/" + partition + " /mnt").run()
print "Mounted /dev/mapper/" + partition + " on /mnt"
@@ -304,10 +308,11 @@
except V7CommandException, e:
print "Error: could not mount data image"
print e
+ e.command.printErrors()
return False
return True
- def unmountDataImage(self):
+ def unmountDataImage(self, ignoreErrors=False):
print "Unmounting /mnt"
sys.stdout.flush()
try:
@@ -317,8 +322,10 @@
Command("kpartx -dv " + self.loopBackDevice).echo()
Command("losetup -d " + self.loopBackDevice).echo()
except V7CommandException, e:
- print e
- print "Error: could not unmount data image."
+ if not ignoreErrors:
+ print "Error: could not unmount data image."
+ print e
+ e.command.printErrors()
return False
return True
@@ -326,7 +333,7 @@
# mount the data image and then write test info
try:
dataImagePath = os.path.join(self.guestImageDirectory, self.dataImageFile)
- self.unmountDataImage()
+ self.unmountDataImage(ignoreErrors=True)
if not self.mountDataImage():
return False
guestScriptFile = "/mnt/v7-guest-script"
@@ -368,9 +375,12 @@
print virtInstall
try:
Command(virtInstall).echo()
- except V7CommandException, e:
- print "Error: could not generate guest config file."
- print e
+ except V7CommandErrorOutput, exception:
+ # ignore spurious stderr output: BZ 687526
+ print "Warning: %s" % exception
+ exception.command.printErrors()
+ except V7CommandException, exception:
+ print "Error: could not generate guest config file:%s" % exception
return False
return True
@@ -439,6 +449,9 @@
try:
Command("virsh start %s" % self.guestName).echo()
print "FV Guest started ..."
+ except V7CommandErrorOutput, exception:
+ print "Warning: %s" % exception
+ exception.command.printErrors()
except V7CommandException, e:
print "Error: could not start the FV Guest."
print e
@@ -452,10 +465,10 @@
while 1:
if count == self.waitTime:
try:
+ print "time out: destroying the guest."
Command("virsh destroy %s" % self.guestName).echo()
- print "time out, the FV Guest was destroyed."
- except V7CommandException, e:
- pass
+ except V7CommandException, exception:
+ print "Warning: %s" % exception
return False
else:
time.sleep(60)
13 years, 2 months
r815 - trunk/tests/profiler
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 00:03:52 +0000 (Wed, 16 Mar 2011)
New Revision: 815
Modified:
trunk/tests/profiler/profiler.py
Log:
678949 - oprofiled did not start on Nehalem-EX platform
Modified: trunk/tests/profiler/profiler.py
===================================================================
--- trunk/tests/profiler/profiler.py 2011-03-16 00:02:12 UTC (rev 814)
+++ trunk/tests/profiler/profiler.py 2011-03-16 00:03:52 UTC (rev 815)
@@ -17,7 +17,7 @@
import sys, os, time, fileinput, commands
from v7.test import Test, TestTag
-from v7.command import Command, V7CommandException
+from v7.command import Command, V7CommandException, V7CommandErrorOutput
from v7.tags import DeviceClass
class ProfilerTest(Test):
@@ -25,6 +25,7 @@
def __init__(self):
Test.__init__(self, name="profiler")
self.deviceClass = DeviceClass.processor
+ self.forcedTimerConfig = False
def tags(self):
return [TestTag.noninteractive, TestTag.certification]
@@ -44,6 +45,11 @@
def getRequiredRPMs(self):
return ["oprofile"]
+ def initialize(self):
+ self.getLinuxImage()
+ self.resetNMIWatchdog()
+ return True
+
def old_run(self):
FAILED = 1
PASSED = 0
@@ -124,8 +130,8 @@
print "^^^^ END: Errors during reset may be ignored. ^^^^\n"
sys.stdout.flush()
+
-
return True
def startOProfile(self):
@@ -146,6 +152,7 @@
command.echo()
command = Command("opcontrol --start")
command.echo()
+ self.getOProfileVersion()
return True
def startDaemon(self):
@@ -170,7 +177,11 @@
def report(self):
try:
Command("opcontrol --dump").echo()
- Command("opreport").echo()
+ try:
+ Command("opreport").echo()
+ except V7CommandErrorOutput, exception:
+ print "Warning: %s" % exception
+ exception.command.printErrors()
except V7CommandException, exception:
print exception
return False
@@ -210,47 +221,92 @@
modprobeConf = open(self.timerConfPath, "a")
modprobeConf.write("options oprofile timer=1\n")
modprobeConf.close()
+ self.forcedTimerConfig = True
except:
return False
- return self.run()
- return False
+ return True
+
def removeTimerConf(self):
if self.checkTimerConf():
for line in fileinput.input(self.timerConfPath, "inplace=1"):
if not line == "options oprofile timer=1\n":
print line.rstrip("\n")
+
+ def resetNMIWatchdog(self):
+ try:
+ self.nmiWatchdog = Command("cat /proc/sys/kernel/nmi_watchdog").getString()
+ print "NMI Watchdog = %s" % self.nmiWatchdog
+ if self.nmiWatchdog != "0":
+ print "reseting NMI watchdog"
+ Command("echo 0 > /proc/sys/kernel/nmi_watchdog").echo()
+ return True
+ except V7CommandException, exception:
+ print "Error: could not read/set NMI Watchdog"
+ print exception
+
+ return False
+
+ def restoreNMIWatchdog(self):
+ try:
+ nmiWatchdog = Command("cat /proc/sys/kernel/nmi_watchdog").getString()
+ if self.nmiWatchdog != "0" and nmiWatchdog != self.nmiWatchdog:
+ print "restoring NMI watchdog"
+ Command("echo %s > /proc/sys/kernel/nmi_watchdog" % self.nmiWatchdog).echo()
+ return True
+ except V7CommandException, exception:
+ print "Error: could not restore NMI Watchdog"
+ print exception
+
+ return False
+ def runOProfileStartup(self):
+ if not self.runSubTest(self.resetOProfile, "Reset"):
+ return False
+ if not self.runSubTest(self.startDaemon, "Start Daemon"):
+ return False
+ if not self.runSubTest(self.startOProfile, "Start OProfile"):
+ return False
+
+ return True
+
def run(self):
FAILED = 1
PASSED = 0
- try:
- self.getLinuxImage()
- if not self.runSubTest(self.resetOProfile, "Reset"):
- return FAILED
- if not self.runSubTest(self.startDaemon, "Start Daemon"):
- return FAILED
- if not self.runSubTest(self.startOProfile, "Start OProfile"):
- return FAILED
- self.getOProfileVersion()
- if not self.report() and not self.forceTimerConf():
+
+ success = True
+
+ if not self.runSubTest(self.initialize, "Initialize"):
+ success = False
+
+ if success and not self.runOProfileStartup():
+ success = False
+
+ # if report fails, re-try with a forced timer config
+ if not self.runSubTest(self.report, "Report"):
+ print "Re-try testing with forced timer configuration:"
+ if self.forceTimerConf():
+ if not self.runOProfileStartup():
+ success = False
+ else:
+ if not self.runSubTest(self.report, "Report"):
+ success = False
self.removeTimerConf()
- return FAILED
+
- self.removeTimerConf()
+ self.restoreNMIWatchdog()
- except Exception, e:
- print "Error: "
- print e
- self.closeOutput()
- return FAILED
# reset - ignore if it fails
try:
- self.resetOProfile()
+ self.runSubTest(self.resetOProfile, "Reset")
except:
pass
- return PASSED
+
+ if success:
+ return PASSED
+ else:
+ return FAILED
if __name__ == "__main__":
test = ProfilerTest()
13 years, 2 months
r814 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-16 00:02:12 +0000 (Wed, 16 Mar 2011)
New Revision: 814
Modified:
trunk/Makefile
Log:
R18
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-03-11 13:30:06 UTC (rev 813)
+++ trunk/Makefile 2011-03-16 00:02:12 UTC (rev 814)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 17
+V7_RELEASE := 18
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, 2 months
r813 - in tags: . v7-V1-3R17/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-11 13:30:06 +0000 (Fri, 11 Mar 2011)
New Revision: 813
Added:
tags/v7-V1-3R17/
tags/v7-V1-3R17/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R17/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R17/v7/version.py (rev 0)
+++ tags/v7-V1-3R17/v7/version.py 2011-03-11 13:30:06 UTC (rev 813)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '17'
+rhel_version = '6'
13 years, 2 months
r812 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-03-11 13:29:01 +0000 (Fri, 11 Mar 2011)
New Revision: 812
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-03-11 13:23:13 UTC (rev 811)
+++ trunk/v7.spec.in 2011-03-11 13:29:01 UTC (rev 812)
@@ -69,6 +69,13 @@
/etc/init.d/v7
%changelog
+* Fri Mar 11 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R17
+ 626970 - FEAT: kdump test needs to verify kdump
+ 682969 - v7 certify test have no return value
+ 676239 - v7 Coverage for loading Tech Preview device drivers in RHEL6.1
+
* Thu Mar 10 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R16
13 years, 2 months