r442 - trunk/tests/info
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 18:39:01 +0000 (Tue, 09 Mar 2010)
New Revision: 442
Modified:
trunk/tests/info/info.py
Log:
568468 - v7 finds no RT kernel ABI Whitelist
Modified: trunk/tests/info/info.py
===================================================================
--- trunk/tests/info/info.py 2010-03-09 18:06:02 UTC (rev 441)
+++ trunk/tests/info/info.py 2010-03-09 18:39:01 UTC (rev 442)
@@ -273,7 +273,7 @@
# 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.arch)
+ whitelist = '/usr/src/kernels/%s-%s/kabi_whitelist' % (self.redHatRelease.getKernel(), self.redHatRelease.getArch())
print "Red Hat Enterprise Linux %u ABI" % self.redHatRelease.getVersion()
print "--------------------------------"
14 years, 2 months
r441 - trunk
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 18:06:02 +0000 (Tue, 09 Mar 2010)
New Revision: 441
Modified:
trunk/Makefile
Log:
R16
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-03-09 18:05:11 UTC (rev 440)
+++ trunk/Makefile 2010-03-09 18:06:02 UTC (rev 441)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.1
-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
14 years, 2 months
r440 - trunk/v7
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 18:05:11 +0000 (Tue, 09 Mar 2010)
New Revision: 440
Modified:
trunk/v7/tags.py
Log:
missed checkin
Modified: trunk/v7/tags.py
===================================================================
--- trunk/v7/tags.py 2010-03-09 15:17:44 UTC (rev 439)
+++ trunk/v7/tags.py 2010-03-09 18:05:11 UTC (rev 440)
@@ -149,6 +149,7 @@
kvm="kvm"
xen="xen"
hvm="hvm"
+ rt="rt"
class SystemFunction:
system = "system"
14 years, 2 months
r439 - in tags: . v7-V1-1R15/v7
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 15:17:44 +0000 (Tue, 09 Mar 2010)
New Revision: 439
Added:
tags/v7-V1-1R15/
tags/v7-V1-1R15/v7/version.py
Log:
tag version
Copied: tags/v7-V1-1R15 (from rev 438, trunk)
Copied: tags/v7-V1-1R15/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-1R15/v7/version.py (rev 0)
+++ tags/v7-V1-1R15/v7/version.py 2010-03-09 15:17:44 UTC (rev 439)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.1'
+release = '15'
+rhel_version = '5'
14 years, 2 months
r438 - trunk
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 15:15:59 +0000 (Tue, 09 Mar 2010)
New Revision: 438
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2010-03-09 15:14:19 UTC (rev 437)
+++ trunk/v7.spec.in 2010-03-09 15:15:59 UTC (rev 438)
@@ -68,6 +68,12 @@
/usr/share/man/man8/v7.8.gz
%changelog
+* Tue Mar 09 2010 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.1 R15
+
+571610 - v7-1.1-13 reports no network test in rhel4
+
* Mon Mar 08 2010 Greg Nichols <gnichols(a)redhat.com>
V7 1.1 R14
14 years, 2 months
r437 - trunk/v7
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 15:14:19 +0000 (Tue, 09 Mar 2010)
New Revision: 437
Modified:
trunk/v7/v7kudzu.py
Log:
571610 - v7-1.1-13 reports no network test in rhel4
Modified: trunk/v7/v7kudzu.py
===================================================================
--- trunk/v7/v7kudzu.py 2010-03-09 14:55:21 UTC (rev 436)
+++ trunk/v7/v7kudzu.py 2010-03-09 15:14:19 UTC (rev 437)
@@ -16,31 +16,30 @@
def __init__(self):
DeviceDetector.__init__(self, name=Constants.kudzu)
- self.hardwareCommand = "/usr/share/rhn/up2date_client/hardware.py"
- self.recordSeparator = "\n" # blank lines separate records - kudzu -p uses "-\n"
self.devices = None
def isValid(self):
- if not os.path.exists(self.hardwareCommand):
- print "Error: can not determine devices: no command %s" % self.hardwareCommand
- return False
- # otherwise
- return True
+ return self.devices and len(self.devices) > 0
def getDevices(self):
-
-
- if not self.isValid():
- return list() # empty
-
if self.devices is not None:
return self.devices
# otherwise
self.devices = list()
+ if os.path.exists("/usr/share/rhn/up2date_client/hardware.py"):
+ self.__getDevices("python /usr/share/rhn/up2date_client/hardware.py", "\n")
+ else:
+ print "Warning: no command /usr/share/rhn/up2date_client/hardware.py"
+
+ self.__getDevices("kudzu -p", "-\n")
+ return self.devices
+
+ def __getDevices(self, command, recordSeparator):
+ self.hardwareCommand = command
+ self.recordSeparator = recordSeparator
+ pipe = os.popen(self.hardwareCommand)
- pipe = os.popen("python " + self.hardwareCommand)
-
properties = dict()
docWrapper = DocumentWrapper()
while 1:
14 years, 2 months
r436 - trunk/v7
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 14:55:21 +0000 (Tue, 09 Mar 2010)
New Revision: 436
Modified:
trunk/v7/environment.py
Log:
https://bugzilla.redhat.com/show_bug.cgi?id=570917
Modified: trunk/v7/environment.py
===================================================================
--- trunk/v7/environment.py 2010-03-09 14:54:27 UTC (rev 435)
+++ trunk/v7/environment.py 2010-03-09 14:55:21 UTC (rev 436)
@@ -35,7 +35,7 @@
self.defaultLibraryDirectory = "/usr/share/v7/lib"
self.defaultLogDirectory = "/var/log/v7"
self.defaultGuestImageDirectory = '/var/lib/xen/images'
- self.defaultKVMGuestImageDirectory = self.defaultDataDirectory
+ self.defaultKVMGuestImageDirectory = '/var/lib/libvirt/images'
self.defaultGuestConfigDirectory = '/etc/xen'
self.defaultKVMGuestConfigDirectory = '/etc/libvirt/qemu'
self.defaultGuestBootDirectory = '/usr/lib/xen/boot/'
14 years, 2 months
r435 - trunk/v7
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 14:54:27 +0000 (Tue, 09 Mar 2010)
New Revision: 435
Modified:
trunk/v7/rundocument.py
Log:
555895 - FEAT: results.xml could divide out the various sub tests.
Modified: trunk/v7/rundocument.py
===================================================================
--- trunk/v7/rundocument.py 2010-03-09 14:39:12 UTC (rev 434)
+++ trunk/v7/rundocument.py 2010-03-09 14:54:27 UTC (rev 435)
@@ -178,16 +178,18 @@
print e
# parser failed, just read the file
- file = open(outputFile)
- output = file.readlines()
- if output and len(output) < 0:
- outputElement = self.findOrCreateElement(self.element, Tags.output)
- textNode = self.setTextNode(outputElement, output.join())
- return True
-
+ try:
+ file = open(outputFile)
+ output = file.readlines()
+ if output and len(output) > 0:
+ outputElement = self.findOrCreateElement(self.element, Tags.output)
+ textNode = self.setTextNode(outputElement, "".join(output))
+ return True
+ except Exception, e:
+ print "Error: could not read log file " + outputFile
+ print e
+ return False
-
-
def getResults(self, environment, resultsFile):
try:
file = open(resultsFile, "r")
14 years, 2 months
r434 - trunk/test-env/bin
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 14:39:12 +0000 (Tue, 09 Mar 2010)
New Revision: 434
Modified:
trunk/test-env/bin/v7-run-simple-test
Log:
555895 - FEAT: results.xml could divide out the various sub tests.
Modified: trunk/test-env/bin/v7-run-simple-test
===================================================================
--- trunk/test-env/bin/v7-run-simple-test 2010-03-09 14:37:18 UTC (rev 433)
+++ trunk/test-env/bin/v7-run-simple-test 2010-03-09 14:39:12 UTC (rev 434)
@@ -65,6 +65,7 @@
fi
{
+ echo "<output>"
echo "Running $ARG_EXECUTABLE_NAME:"
PYTHONPATH=/usr/share/v7/lib; export PYTHONPATH
$ARG_EXECUTABLE_NAME
@@ -72,6 +73,7 @@
echo "$EXIT_CODE" > $TMPFILE
echo "...finished running $ARG_EXECUTABLE_NAME, exit code=$EXIT_CODE"
+ echo "</output>"
} 2>&1 | tee -a $OUTPUTFILE
echo "recovered exit code=`cat $TMPFILE`"
14 years, 2 months
r433 - trunk
by gnichols@fedoraproject.org
Author: gnichols
Date: 2010-03-09 14:37:18 +0000 (Tue, 09 Mar 2010)
New Revision: 433
Modified:
trunk/Makefile
Log:
R15
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2010-03-09 03:55:26 UTC (rev 432)
+++ trunk/Makefile 2010-03-09 14:37:18 UTC (rev 433)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.1
-V7_RELEASE := 14
+V7_RELEASE := 15
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
14 years, 2 months