r1289 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 13:25:08 +0000 (Fri, 20 Apr 2012)
New Revision: 1289
Modified:
trunk/tests/info/Makefile
Log:
810497 - v7 info - make: *** No rule to make target kernelInfo.xml
Modified: trunk/tests/info/Makefile
===================================================================
--- trunk/tests/info/Makefile 2012-04-20 13:22:45 UTC (rev 1288)
+++ trunk/tests/info/Makefile 2012-04-20 13:25:08 UTC (rev 1289)
@@ -1,26 +1,7 @@
-# v7/info
-TOPLEVEL_NAMESPACE=/V7
-# The name of the package under test:
-PACKAGE_NAME=v7
+# no build necessary
+build: ;
-# The path of the test below the package:
-RELATIVE_PATH=info
-
-# 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
-
-BUILT_FILES=
-FILES=runtest.sh kernelInfo.xml
-
-run: $(FILES) build
- ./runtest.sh
-
# Include Common Makefile
include $(DESTDIR)/usr/share/v7/lib/v7-make.include
12 years
r1288 - trunk/tests/info
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 13:22:45 +0000 (Fri, 20 Apr 2012)
New Revision: 1288
Modified:
trunk/tests/info/info.py
Log:
812437 - getModuleFile may return 'null' \n811247 - kabi-whitelists structure changing makes kabi check fail
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2012-04-20 13:19:08 UTC (rev 1287)
+++ trunk/tests/info/info.py 2012-04-20 13:22:45 UTC (rev 1288)
@@ -292,6 +292,10 @@
module = line.split()[0]
moduleFile = self.getModuleFile(module)
+ if not moduleFile:
+ success = False
+ continue
+
# check that modules come from the kernel RPM.
if not moduleFile in kernelRPMModuleList:
# RHEL4 does not include kmod
@@ -320,6 +324,8 @@
warnVendorList = ["Fedora", "Fedora Project"]
try:
moduleFile = self.getModuleFile(module)
+ if not moduleFile:
+ return False
vendor = Command("rpm -qf %s --qf %%{VENDOR}" % moduleFile).getString()
if vendor in goodVendorList:
@@ -418,10 +424,16 @@
if os.path.islink(moduleFile):
moduleFile = os.readlink(moduleFile)
return moduleFile
+ else:
+ print "Error: module source version mismatch: "
+ print " /sys/modules/%s/srcversion: %s" % (module, sysSrcVersion)
+ print " modinfo -F srcversion: %s" % modInfoSrcVersion
+
except V7CommandException, e:
- print "Error: could no find module file:"
+ print "Error: could no find module file for %s:" % module
print e
e.command.printErrors()
+
return None
@@ -441,13 +453,19 @@
# skip abi checks for rt kernel
if self.redHatRelease.getKernelFlavor() == Constants.rt:
return True
- whitelist = '/usr/src/kernels/%s-%s/kabi_whitelist' % (self.redHatRelease.getKernel(), self.redHatRelease.getArch())
+ whitelistLocations = [("/lib/modules/kabi-current/kabi_whitelist_" + self.redHatRelease.getArch()), # RHEL 6.3
+ ("/lib/modules/kabi/kabi_whitelist_" + self.redHatRelease.getArch()), # RHEL 6.2 ?
+ ("/usr/src/kernels/%s-%s/kabi_whitelist" % (self.redHatRelease.getKernel(), self.redHatRelease.getArch())) # ?
+ ]
+
+ for whitelist in whitelistLocations:
+ if os.path.exists(whitelist):
+ break
+
if not os.path.exists(whitelist):
- usrSrcWhitelist = whitelist
- whitelist = "/lib/modules/kabi/kabi_whitelist_" + self.redHatRelease.getArch()
- if not os.path.exists(whitelist):
- print "Error: could not find whitelist file %s or %s" %(usrSrcWhitelist, whitelist)
- return False
+ print "Error: could not find whitelist file in any of the following locations:"
+ print "\n".join(whitelistLocations)
+ return False
print "Red Hat Enterprise Linux %u ABI" % self.redHatRelease.getVersion()
print "--------------------------------"
12 years
r1287 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 13:19:08 +0000 (Fri, 20 Apr 2012)
New Revision: 1287
Modified:
trunk/v7/redhatrelease.py
Log:
811565 - v7 traceback on RHEL 7 Alpha1
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2012-04-20 13:13:40 UTC (rev 1286)
+++ trunk/v7/redhatrelease.py 2012-04-20 13:19:08 UTC (rev 1287)
@@ -42,7 +42,7 @@
def _parse(self):
if self.text:
- pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[0-9\.]+)(?P<candidate>[a-zA-Z\ ]+)\((?P<name>[a-zA-Z0-9\ ]+)\)")
+ pattern = re.compile("^(?P<product>[a-zA-Z\ ]+)release (?P<number>[0-9\.]+)(?P<candidate>[a-zA-Z0-9\ ]+)\((?P<name>[a-zA-Z0-9\ ]+)\)")
match = pattern.match(self.text)
if not match:
self.valid = False
@@ -206,6 +206,7 @@
"Red Hat Enterprise Linux release 4 (Bogus Update 3)",
"Red Hat Enterprise Linux Server release 5.5 Beta (Tikanga)",
"Red Hat Enterprise Linux release 6.0 Beta (Santiago)",
+ "Red Hat Enterprise Linux Server release 7.0 Alpha1 (Maipo)"
)
for text in texts:
12 years
r1286 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 13:13:40 +0000 (Fri, 20 Apr 2012)
New Revision: 1286
Modified:
trunk/v7/catalog.py
Log:
813405 - v7 should not prompt for certification id when hardware catalog is unreachable\n 813090 - v7 plan fails when the Hardware Catalog Server is not reachable from the SUT\n 809026 - v7 trivial formatting fix
Modified: trunk/v7/catalog.py
===================================================================
--- trunk/v7/catalog.py 2012-04-20 13:08:22 UTC (rev 1285)
+++ trunk/v7/catalog.py 2012-04-20 13:13:40 UTC (rev 1286)
@@ -52,7 +52,7 @@
def getCertificationID(self, resultsDocument):
if not self.isReachable():
print "Could not reach the Red Hat Hardware Catalog %s" % self.getCatalogServer()
- answer = "existing"
+ answer = "none"
else:
# otherwise
while True:
@@ -67,7 +67,7 @@
pass
if answer not in answers:
- print "Please enter one of the following: %s" % "".join(answers)
+ print "Please enter one of the following: %s" % " | ".join(answers)
else:
break
@@ -77,10 +77,9 @@
while True:
id = self.ui.prompt("Please enter the certification ID:")
try:
- if id != "":
- int(id)
- resultsDocument.setCertificationID(id)
- return True
+ int(id)
+ resultsDocument.setCertificationID(id)
+ return True
except ValueError:
print "%s is not a valid ID, it must be an integer. Enter 0 if ID is unknown"
# otherwise
12 years
r1285 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-20 13:08:22 +0000 (Fri, 20 Apr 2012)
New Revision: 1285
Modified:
trunk/Makefile
Log:
R21
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-04-17 15:38:13 UTC (rev 1284)
+++ trunk/Makefile 2012-04-20 13:08:22 UTC (rev 1285)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 20
+V7_RELEASE := 21
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years
r1284 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-17 15:38:13 +0000 (Tue, 17 Apr 2012)
New Revision: 1284
Added:
tags/v7-V1-5R20/
Log:
tag version
12 years
r1283 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-17 15:36:04 +0000 (Tue, 17 Apr 2012)
New Revision: 1283
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2012-04-17 15:35:44 UTC (rev 1282)
+++ trunk/v7.spec.in 2012-04-17 15:36:04 UTC (rev 1283)
@@ -80,7 +80,12 @@
%changelog
+* Tue Apr 17 2012 Greg Nichols <gnichols(a)redhat.com>
+v7 1.5 R20
+
+ 813090 - v7 plan fails when the Hardware Catalog Server is not reachable from the SUT
+
* Mon Apr 16 2012 Greg Nichols <gnichols(a)redhat.com>
v7 1.5 R19
12 years
r1282 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-17 15:35:44 +0000 (Tue, 17 Apr 2012)
New Revision: 1282
Modified:
trunk/Makefile
Log:
R20
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2012-04-17 15:35:16 UTC (rev 1281)
+++ trunk/Makefile 2012-04-17 15:35:44 UTC (rev 1282)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.5
-V7_RELEASE := 19
+V7_RELEASE := 20
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years
r1281 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-17 15:35:16 +0000 (Tue, 17 Apr 2012)
New Revision: 1281
Modified:
trunk/v7/catalog.py
Log:
813090 - v7 plan fails when the Hardware Catalog Server is not reachable from the SUT
Modified: trunk/v7/catalog.py
===================================================================
--- trunk/v7/catalog.py 2012-04-16 12:50:19 UTC (rev 1280)
+++ trunk/v7/catalog.py 2012-04-17 15:35:16 UTC (rev 1281)
@@ -44,7 +44,7 @@
try:
request = urllib2.urlopen(self.getCatalogServer())
except Exception, e:
- print "Could not reach catalog server %s" % catalogServer
+ print "Could not reach catalog server %s" % self.getCatalogServer()
print e
return False
return True
12 years
r1280 - tags
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2012-04-16 12:50:19 +0000 (Mon, 16 Apr 2012)
New Revision: 1280
Added:
tags/v7-V1-5R19/
Log:
tag version
12 years