r1259 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:37:45 +0000 (Tue, 03 Apr 2012)
New Revision: 1259
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-04-03 00:36:44 UTC (rev 1258)
+++ trunk/v7.spec.in 2012-04-03 00:37:45 UTC (rev 1259)
@@ -81,12 +81,18 @@
%changelog
-* Wed Mar 28 2012 Greg Nichols <gnichols(a)redhat.com>
+* Mon Apr 02 2012 Greg Nichols <gnichols(a)redhat.com>
-V7 1.5 R13
+V7 1.5 R14
807714 - v7 1.5 R12 requires udisks package not in RHEL5
-
+ 807552 - v7 info: Environment instance has no attribute 'getCertificationName'
+ 713368 - failed to get httptest.file if ipv6 available on both sides
+ 649675 - RHEL5 doesn't install xen packages as dependencies by default
+ 611409 - Test Suite should collect the information about the current used video controller
+ 608568 - FEAT: can v7 detect non Red Hat shipped xorg drivers ?
+ 488745 - Add suggested IB specific commands to network test
+
* Tue Mar 27 2012 Greg Nichols <gnichols(a)redhat.com>
V7 1.5 R12
12 years, 1 month
r1258 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:36:44 +0000 (Tue, 03 Apr 2012)
New Revision: 1258
Modified:
trunk/v7/environment.py
Log:
set default catalog URL to partners for beta
Modified: trunk/v7/environment.py
===================================================================
--- trunk/v7/environment.py 2012-04-03 00:33:11 UTC (rev 1257)
+++ trunk/v7/environment.py 2012-04-03 00:36:44 UTC (rev 1258)
@@ -48,7 +48,7 @@
self.defaultResultsWarningSize = 12 * 1048576 # bytes
self.defaultFVGuestTimelimit = 60 # minutes
self.defaultRebootTimelimit = 10 # minutes
- self.defaultCatalogURL="http://hwcert-web2-test.devel.redhat.com/xmlrpc.cgi"
+ self.defaultCatalogURL="http://partner-hwcert.redhat.com/xmlrpc.cgi"
try:
self.load(self.environmentFile)
12 years, 1 month
r1257 - in trunk/tests: . infiniband
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:33:11 +0000 (Tue, 03 Apr 2012)
New Revision: 1257
Added:
trunk/tests/infiniband/
trunk/tests/infiniband/Makefile
trunk/tests/infiniband/infiniband.py
Modified:
trunk/tests/Makefile
Log:
488745 - Add suggested IB specific commands to network test
Modified: trunk/tests/Makefile
===================================================================
--- trunk/tests/Makefile 2012-04-03 00:32:05 UTC (rev 1256)
+++ trunk/tests/Makefile 2012-04-03 00:33:11 UTC (rev 1257)
@@ -15,7 +15,7 @@
.PHONY: clean install
-SUBDIRS := audio bluray cdrom dvd core info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage rteval hwlatdetect reboot fencing wlan kdump
+SUBDIRS := audio bluray cdrom dvd core info memory network pccard storage tape usb video battery suspend lid expresscard cpuscaling profiler fv_core fv_memory fv_network fv_storage rteval hwlatdetect reboot fencing wlan kdump infiniband
clean:
for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
Added: trunk/tests/infiniband/Makefile
===================================================================
--- trunk/tests/infiniband/Makefile (rev 0)
+++ trunk/tests/infiniband/Makefile 2012-04-03 00:33:11 UTC (rev 1257)
@@ -0,0 +1,31 @@
+# V7/wlan
+TOPLEVEL_NAMESPACE=/V7
+
+# The name of the package under test:
+PACKAGE_NAME=v7
+
+# The path of the test below the package:
+RELATIVE_PATH=infiniband
+
+# Version of the Test. Used with make tag.
+export TESTVERSION=1.1
+
+# The compiled namespace of the test.
+export TEST=$(TOPLEVEL_NAMESPACE)/$(PACKAGE_NAME)/$(RELATIVE_PATH)
+
+.PHONY: all install download clean
+
+FILES=infiniband.py
+
+run: $(FILES) build
+
+build: $(BUILT_FILES)
+ chmod a+x infiniband.py
+
+clean:
+ rm -f $(BUILT_FILES)
+
+
+# Include Common Makefile
+include $(DESTDIR)/usr/share/v7/lib/v7-make.include
+
Added: trunk/tests/infiniband/infiniband.py
===================================================================
--- trunk/tests/infiniband/infiniband.py (rev 0)
+++ trunk/tests/infiniband/infiniband.py 2012-04-03 00:33:11 UTC (rev 1257)
@@ -0,0 +1,84 @@
+#!/usr/bin/python
+# Copyright (c) 2012 Red Hat, Inc. All rights reserved. This copyrighted material
+# is made available to anyone wishing to use, modify, copy, or
+# redistribute it subject to the terms and conditions of the GNU General
+# Public License v.2.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# Author: Greg Nichols
+#
+import os, string
+
+from v7.tags import Constants, DeviceClass
+from v7.test import Test, TestTag
+from v7.command import Command, V7CommandException
+
+
+FAILED = 1
+PASSED = 0
+
+class InfinibandTest(Test):
+
+ def __init__(self):
+ Test.__init__(self, name="infiniband")
+ self.deviceClass = DeviceClass.network_interface
+
+ def tags(self):
+ return [TestTag.noninteractive, TestTag.certification]
+
+ def plan(self, devices):
+ properties = dict()
+ tests = list()
+ # x060a bridge to IB
+ properties['pci.device_class'] = 6
+ properties['pci.device_subclass'] = 10
+ tests = self.planWith(devices, properties, all=False, strict=True)
+ if tests:
+ return tests
+ # otherwise
+ # x0c06 IB serial controller
+ properties['pci.device_class'] = 12
+ properties['pci.device_subclass'] = 6
+ return self.planWith(devices, properties, all=False, strict=True)
+
+
+ def getRequiredRPMs(self):
+ rpms = ["infiniband-diags"]
+ return rpms
+
+ def logStatus(self):
+ try:
+ Command("ibstatus").echo()
+ Command("ibstat").echo()
+ return True
+ except V7CommandException, e:
+ print "Error: %s" % e.command.command
+ print e
+
+ return False
+
+
+ def run(self):
+
+ result = PASSED
+ if not self.runSubTest(self.logStatus, "Log Status", "log infiniband status"):
+ result = FAILED
+
+ return result
+
+if __name__ == "__main__":
+
+ test = InfinibandTest()
+ returnValue = test.do(sys.argv)
+ sys.exit(returnValue)
+
+
+
+
12 years, 1 month
r1256 - trunk/tests/video
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:32:05 +0000 (Tue, 03 Apr 2012)
New Revision: 1256
Modified:
trunk/tests/video/video.py
Log:
608568 - FEAT: can v7 detect non Red Hat shipped xorg drivers ?
Modified: trunk/tests/video/video.py
===================================================================
--- trunk/tests/video/video.py 2012-04-03 00:24:10 UTC (rev 1255)
+++ trunk/tests/video/video.py 2012-04-03 00:32:05 UTC (rev 1256)
@@ -233,6 +233,64 @@
return success
+ def checkXModules(self):
+ logPath = "/var/log/Xorg.0.log"
+ log = open(logPath, "r")
+ if not log:
+ print "Error: could not open %s" % logPath
+ return False
+
+ success = True
+ print "Checking loaded X modules -----------------------\n"
+ print "X log file: %s" % logPath
+ for line in log.readlines():
+ # this presumes Loading lines that include a slash means a path
+ if line.find("(II) Loading /") >= 0:
+ # is there a oneline way to do this?
+ xmoduleFile = line.split()
+ xmoduleFile = xmoduleFile[-1]
+
+ try:
+ Command("rpm -Vf %s" % xmoduleFile).run()
+ self.checkXModuleVendorAndBuildHost(xmoduleFile)
+ except Exception, e:
+ print "Error: RPM verification failed for X module %s" % xmoduleFile
+ print e
+ success = False
+
+ print "-------------------------------------------------\n"
+ log.close()
+ return success
+
+ def checkXModuleVendorAndBuildHost(self, xmoduleFile):
+ # Maybe this should be in a library; this function lifted from info.py
+ result = True
+ goodVendorList = ["Red Hat", "Red Hat, Inc."]
+ warnVendorList = ["Fedora", "Fedora Project"]
+ try:
+
+ vendor = Command("rpm -qf %s --qf %%{VENDOR}" % xmoduleFile).getString()
+ if vendor in goodVendorList:
+ pass
+ elif vendor in warnVendorList:
+ print "Warning: %s module %s found" % (vendor, xmoduleFile)
+ else:
+ print "Error: Non-Red Hat vendor %s for module %s" % (vendor, xmoduleFile)
+ result = False
+
+ buildhost = Command("rpm -qf %s --qf %%{BUILDHOST}" % xmoduleFile).getString()
+ if "redhat.com" not in buildhost:
+ print "Error: X module %s was built on %s and not built at Red Hat." % (xmoduleFile, buildhost)
+ result = False
+ except V7CommandException, exception:
+ print "Error: could not determine X module packager for %s" % xmoduleFile
+ print exception
+ result = False
+
+ return result
+
+
+
def logDriverInfo(self):
logPath = "/var/log/Xorg.0.log"
log = open(logPath, "r")
@@ -294,7 +352,7 @@
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.checkDepthAndResolution() and self.checkXModules()):
self.logDriverInfo()
result = PASSED
print "Video test on device %s passed." % (self.interface)
12 years, 1 month
r1255 - trunk/tests/video
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:24:10 +0000 (Tue, 03 Apr 2012)
New Revision: 1255
Modified:
trunk/tests/video/video.py
Log:
611409 - Test Suite should collect the information about the current used video controller
Modified: trunk/tests/video/video.py
===================================================================
--- trunk/tests/video/video.py 2012-04-03 00:21:11 UTC (rev 1254)
+++ trunk/tests/video/video.py 2012-04-03 00:24:10 UTC (rev 1255)
@@ -73,7 +73,8 @@
def getRequiredRPMs(self):
rpms = ["xorg-x11-apps"]
- rpms.append("xorg-x11-utils") # for xdpyinfo
+ rpms.append("xorg-x11-utils") # for xdpyinfo and xvinfo
+ rpms.append("glx-utils") # for xdriinfo and glxinfo
if "Red Hat" in self.redHatRelease.getProduct() and self.redHatRelease.getVersion() < 6:
rpms.append("system-config-display") # for system-config-display
else:
@@ -261,6 +262,15 @@
log.close()
break
print "-------------------------------------------------"
+
+ # Should this output be stored in attachments?
+ Command("xvinfo").echoIgnoreErrors()
+ print "-------------------------------------------------"
+ Command("xdriinfo").echoIgnoreErrors()
+ print "-------------------------------------------------"
+ Command("glxinfo").echoIgnoreErrors()
+ print "-------------------------------------------------"
+
def checkConnections(self):
sys.stdout.write("Checking for displays...")
12 years, 1 month
r1254 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:21:11 +0000 (Tue, 03 Apr 2012)
New Revision: 1254
Modified:
trunk/v7/fvtest.py
Log:
649675 - RHEL5 doesn't install xen packages as dependencies by default
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2012-04-03 00:19:24 UTC (rev 1253)
+++ trunk/v7/fvtest.py 2012-04-03 00:21:11 UTC (rev 1254)
@@ -201,6 +201,10 @@
rpms.append("qemu-kvm")
rpms.append("qemu-kvm-tools")
rpms.append("python-virtinst")
+ elif self.hypervisor == Constants.xen:
+ rpms.append("xen")
+ if self.redHatRelease.getArch() == Constants.ia64:
+ rpms.append("xen-ia64-guest-firmware")
return rpms
def verifyGuest(self):
12 years, 1 month
r1253 - trunk/tests/network
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:19:24 +0000 (Tue, 03 Apr 2012)
New Revision: 1253
Modified:
trunk/tests/network/network.py
Log:
713368 - failed to get httptest.file if ipv6 available on both sides
Modified: trunk/tests/network/network.py
===================================================================
--- trunk/tests/network/network.py 2012-04-03 00:17:31 UTC (rev 1252)
+++ trunk/tests/network/network.py 2012-04-03 00:19:24 UTC (rev 1253)
@@ -213,6 +213,7 @@
def addRoute(self):
# is the test server specified by IP address or by host name?
+ # ipv6 ??
pattern = re.compile("\d+\.\d+\.\d+\.\d+")
match = pattern.search(self.getTestServer())
if match:
@@ -328,7 +329,7 @@
return False
def getIPAddress(self, interface):
- # what about IP v6?
+ # what about ipv6?
pipe = os.popen("ip -4 addr show %s" % (interface))
pattern = re.compile("\d+\.\d+\.\d+\.\d+")
while 1:
@@ -706,12 +707,14 @@
print "Upload took %.2f seconds, %.2f MB/sec" % (stopTime-startTime, size/((stopTime-startTime)*1000000))
#get the requests' IP address as seen by the server
- pattern = re.compile("[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
+ # might be ipv4 or ipv6
+ pattern = re.compile("From IP:[ \t]*(?P<address>[^\s]*)")
+
match = pattern.search(response)
if match:
- uploadIPAddress = match.group()
+ uploadIPAddress = match.group("address")
else:
- "Warning: could not read upload IP address from response, assuming device IP address"
+ print "Warning: could not read upload IP address from response, assuming device IP address"
uploadIPAddress = self.ipAddress
return (sentCheckSum, uploadIPAddress)
12 years, 1 month
r1252 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:17:31 +0000 (Tue, 03 Apr 2012)
New Revision: 1252
Modified:
trunk/v7/environment.py
Log:
807552 - v7 info: Environment instance has no attribute getCertificationName
Modified: trunk/v7/environment.py
===================================================================
--- trunk/v7/environment.py 2012-04-03 00:15:01 UTC (rev 1251)
+++ trunk/v7/environment.py 2012-04-03 00:17:31 UTC (rev 1252)
@@ -113,7 +113,8 @@
specialCaseNames = {'DatabaseName': 'getResultsFileName',
'Export': "getServerExport",
'MaximumAttachmentFileSize': 'getMaximumAttachmentSize',
- 'Transfer': 'getServerTransfer' }
+ 'Transfer': 'getServerTransfer',
+ 'CertificationName': 'getCertificationFileName'}
changed = False
12 years, 1 month
r1251 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:15:01 +0000 (Tue, 03 Apr 2012)
New Revision: 1251
Modified:
trunk/v7/hardwaretest.py
trunk/v7/planner.py
Log:
807714 - v7 1.5 R12 requires udisks package not in RHEL5
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2012-04-03 00:14:27 UTC (rev 1250)
+++ trunk/v7/hardwaretest.py 2012-04-03 00:15:01 UTC (rev 1251)
@@ -318,7 +318,7 @@
return True
self.load()
self.checkHAL()
- self.planner = Planner(self.options, virtualization=self.getVirtualization())
+ self.planner = Planner(self.options, virtualization=self.getVirtualization(), redHatRelease=self.redHatRelease)
self.planner.analyse(self.environment.getSourceDirectory())
tests = self.planner.plan()
if not self.certification:
@@ -1297,7 +1297,7 @@
return
# otherwise, get the test to be added
- planner = Planner(self.options, virtualization=None)
+ planner = Planner(self.options, virtualization=None, redHatRelease=self.redHatRelease)
planner.analyse(self.environment.getSourceDirectory())
try:
Modified: trunk/v7/planner.py
===================================================================
--- trunk/v7/planner.py 2012-04-03 00:14:27 UTC (rev 1250)
+++ trunk/v7/planner.py 2012-04-03 00:15:01 UTC (rev 1251)
@@ -37,7 +37,7 @@
dictionaries, and provides lists of test(s) by various criteria
"""
- def __init__(self, options, virtualization):
+ def __init__(self, options, virtualization, redHatRelease):
self.options = options
self.Debugging = self.options.debug != Constants.off
self.deviceTests = list()
@@ -46,6 +46,7 @@
self.devices = list()
self.virtualization = virtualization
self.plannedTests = list()
+ self.redHatRelease = redHatRelease
def analyse(self, testDirectory):
"""Walk through the test directory looking for v7.Test classes"""
@@ -125,8 +126,10 @@
if not hal.enabled:
kudzu = Kudzu()
self.devices.extend(kudzu.getDevices())
- udisks = UDisksDeviceDetector()
- self.devices.extend(udisks.getDevices())
+ # run udisks only on RHEL 6 and beyond
+ if not "Red Hat Enterprise Linux" in self.redHatRelease.getProduct() or self.redHatRelease.getVersion() > 5:
+ udisks = UDisksDeviceDetector()
+ self.devices.extend(udisks.getDevices())
def getTestsFor(self, device):
devices = list()
12 years, 1 month
r1250 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-03 00:14:27 +0000 (Tue, 03 Apr 2012)
New Revision: 1250
Modified:
trunk/Makefile
Log:
R14
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-03-29 00:20:29 UTC (rev 1249)
+++ trunk/Makefile 2012-04-03 00:14:27 UTC (rev 1250)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 13
+V7_RELEASE := 14
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
@@ -83,7 +83,7 @@
echo "*.bz2" >> $@
echo "v7spec.*" >> $@
-v7.spec: v7.spec.in v7spec.py v7/version.py
+v7.spec: v7.spec.in v7spec.py mark-version
./v7spec.py --rhelVersion $(V7_RHEL_VERSION)
v7-server.spec: v7-server.spec.in Makefile
12 years, 1 month