r462 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 22:57:45 +0000 (Thu, 11 Mar 2010)
New Revision: 462
Modified:
trunk/v7/fvtest.py
Log:
572346 - FV guest created config file provides invalid default bridge device
Modified: trunk/v7/fvtest.py
===================================================================
--- trunk/v7/fvtest.py 2010-03-11 22:51:56 UTC (rev 461)
+++ trunk/v7/fvtest.py 2010-03-11 22:57:45 UTC (rev 462)
@@ -303,7 +303,7 @@
except Exception, e:
print "Warning: could not determine xen bridge device, assuming xenbr0"
print e
- xenbr = "xenbr0"
+ xenbr = "0"
try:
arch = Command("uname -i").getString()
14 years, 3 months
r461 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 22:51:56 +0000 (Thu, 11 Mar 2010)
New Revision: 461
Modified:
trunk/v7/redhatrelease.py
Log:
568465 - v7 shows that RT kernel was not built by Red Hat
Modified: trunk/v7/redhatrelease.py
===================================================================
--- trunk/v7/redhatrelease.py 2010-03-11 22:49:12 UTC (rev 460)
+++ trunk/v7/redhatrelease.py 2010-03-11 22:51:56 UTC (rev 461)
@@ -106,7 +106,7 @@
# RT kernel tags rt on the end of el5
if match.group("flavor") == "rt":
self.kernelRPMName = self.kernelRPMName + "rt"
- self.kernelDevelRPMName = kernelDevelRPMName + "rt"
+ self.kernelDevelRPMName = self.kernelDevelRPMName + "rt"
elif 'Fedora' in self.getProduct():
pattern = re.compile("(?P<versionRelease>[^a-z]*)(?P<product>fc[0-9]+)(?P<arch>\..*)$")
14 years, 3 months
r460 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 22:49:12 +0000 (Thu, 11 Mar 2010)
New Revision: 460
Modified:
trunk/v7/command-popen2.py
Log:
572606 - storage test traceback on RHEL4/s390
Modified: trunk/v7/command-popen2.py
===================================================================
--- trunk/v7/command-popen2.py 2010-03-11 22:46:48 UTC (rev 459)
+++ trunk/v7/command-popen2.py 2010-03-11 22:49:12 UTC (rev 460)
@@ -125,7 +125,7 @@
self._run()
if self.singleLine:
- if len(self.output) > 1:
+ if len(self.output) is not 1:
raise V7CommandException(self, "Found %u lines of output, expected 1" % len(self.output))
line = self.output[0].strip()
14 years, 3 months
r459 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 22:46:48 +0000 (Thu, 11 Mar 2010)
New Revision: 459
Modified:
trunk/v7/opticalDiskTest.py
Log:
572660 - V7 will double plan floppy, cdrom and storage on RHEL4.8
Modified: trunk/v7/opticalDiskTest.py
===================================================================
--- trunk/v7/opticalDiskTest.py 2010-03-11 22:46:16 UTC (rev 458)
+++ trunk/v7/opticalDiskTest.py 2010-03-11 22:46:48 UTC (rev 459)
@@ -69,7 +69,7 @@
return None
def plan(self, devices):
- tests = list()
+ tests = dict()
for device in devices:
disk = None
if 'storage.cdrom' in device.getProperty("info.capabilities") and self.hasAnyCDROMType(device):
@@ -77,13 +77,13 @@
elif 'CDROM' in device.getProperty("class") and self.hasAnyCDROMTypeProc(device):
disk = device.getProperty("device")
- if disk:
+ if disk and not disk in tests:
test = self.makeCopy()
test.setDevice(device)
test.setLogicalDeviceName(disk)
- tests.append(test)
+ tests[disk] = test
- return tests
+ return tests.values()
def getRequiredRPMs(self):
14 years, 3 months
r458 - trunk/tests/floppy
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 22:46:16 +0000 (Thu, 11 Mar 2010)
New Revision: 458
Modified:
trunk/tests/floppy/floppy.py
Log:
572660 - V7 will double plan floppy, cdrom and storage on RHEL4.8
Modified: trunk/tests/floppy/floppy.py
===================================================================
--- trunk/tests/floppy/floppy.py 2010-03-11 22:44:01 UTC (rev 457)
+++ trunk/tests/floppy/floppy.py 2010-03-11 22:46:16 UTC (rev 458)
@@ -40,7 +40,7 @@
# YK: re-wrote the plan part
def plan(self, devices):
- tests = list()
+ tests = dict()
for device in devices:
fddisk = None
if 'floppy' in device.getProperty("storage.drive_type"):
@@ -50,12 +50,13 @@
fddisk = fddisk[5:]
elif 'FLOPPY' in device.getProperty("class"):
fddisk = device.getProperty("device")
- if fddisk:
+
+ if fddisk and not fddisk in tests:
test = self.makeCopy()
test.setDevice(device)
test.setLogicalDeviceName(fddisk)
- tests.append(test)
- return tests
+ tests[fddisk] = test
+ return tests.values()
def run(self):
osRelease = open('/etc/redhat-release').read()
14 years, 3 months
r457 - trunk/tests/storage
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 22:44:01 +0000 (Thu, 11 Mar 2010)
New Revision: 457
Modified:
trunk/tests/storage/storage.py
Log:
572660 - V7 will double plan floppy, cdrom and storage on RHEL4.8
Modified: trunk/tests/storage/storage.py
===================================================================
--- trunk/tests/storage/storage.py 2010-03-11 16:34:51 UTC (rev 456)
+++ trunk/tests/storage/storage.py 2010-03-11 22:44:01 UTC (rev 457)
@@ -40,7 +40,7 @@
self.deviceClass = DeviceClass.hard_disk
def plan(self, devices):
- tests = list()
+ tests = dict()
controllers = ''
for device in devices:
disk = None
@@ -83,12 +83,12 @@
else:
disk = device.getProperty("device")
- if disk:
+ if disk and not disk in tests:
test = self.makeCopy()
test.setDevice(device)
test.setLogicalDeviceName(disk)
- tests.append(test)
- return tests
+ tests[disk] = test
+ return tests.values()
def doDt(self, minBs, maxBs, options):
"""Helper function: run dt with various block sizes and reasonable defaults."""
14 years, 3 months
r456 - trunk/tests/rteval
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 16:34:51 +0000 (Thu, 11 Mar 2010)
New Revision: 456
Modified:
trunk/tests/rteval/v7_rteval.py
Log:
change duration to 12h
Modified: trunk/tests/rteval/v7_rteval.py
===================================================================
--- trunk/tests/rteval/v7_rteval.py 2010-03-11 14:42:28 UTC (rev 455)
+++ trunk/tests/rteval/v7_rteval.py 2010-03-11 16:34:51 UTC (rev 456)
@@ -83,7 +83,7 @@
try:
import rteval.rteval
- args = ['-d', '4h']
+ args = ['-d', '12h']
self.rteval = rteval.rteval.RtEval(args)
if self.rteval.rteval() != 0:
14 years, 3 months
r455 - trunk/tools/bin
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 14:42:28 +0000 (Thu, 11 Mar 2010)
New Revision: 455
Modified:
trunk/tools/bin/v7-mount-data-image
Log:
added -l/--loopBackDevice option so unmount can clean up the loopback device
Modified: trunk/tools/bin/v7-mount-data-image
===================================================================
--- trunk/tools/bin/v7-mount-data-image 2010-03-11 14:12:37 UTC (rev 454)
+++ trunk/tools/bin/v7-mount-data-image 2010-03-11 14:42:28 UTC (rev 455)
@@ -44,14 +44,20 @@
parser.add_option("-u", "--unmount",
action="store_true", dest="unmount", default=False,
help="unmount the data image")
+parser.add_option("-l", "--loopBackDevice",
+ action="store", type="string", dest="loopBackDevice",
+ help="Loopback device to be cleaned-up by unmount")
(options,args) = parser.parse_args()
fvTest = FvTest("fv_generic")
if options.unmount:
+ if options.loopBackDevice:
+ fvTest.loopBackDevice = options.loopBackDevice
fvTest.unmountDataImage()
else:
fvTest.mountDataImage()
+ print "Loopback Device: " + fvTest.loopBackDevice
14 years, 3 months
r454 - trunk/tools
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 14:12:37 +0000 (Thu, 11 Mar 2010)
New Revision: 454
Added:
trunk/tools/Makefile
Log:
tools installation
Added: trunk/tools/Makefile
===================================================================
--- trunk/tools/Makefile (rev 0)
+++ trunk/tools/Makefile 2010-03-11 14:12:37 UTC (rev 454)
@@ -0,0 +1,29 @@
+# Copyright (c) 2006 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
+
+HERE=$(shell pwd)
+
+.PHONY: clean install
+
+SUBDIRS := bin rhts
+
+all:
+ for i in $(SUBDIRS); do $(MAKE) -C $$i; done
+
+install:
+ for i in $(SUBDIRS); do $(MAKE) -C $$i install; done
+
+clean:
+ for i in $(SUBDIRS); do $(MAKE) -C $$i clean; done
14 years, 3 months
r453 - in trunk/tools: . rhts
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2010-03-11 14:12:02 +0000 (Thu, 11 Mar 2010)
New Revision: 453
Added:
trunk/tools/rhts/
trunk/tools/rhts/Makefile
Log:
tools installation
Added: trunk/tools/rhts/Makefile
===================================================================
--- trunk/tools/rhts/Makefile (rev 0)
+++ trunk/tools/rhts/Makefile 2010-03-11 14:12:02 UTC (rev 453)
@@ -0,0 +1,25 @@
+# Copyright (c) 2006 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
+
+HERE=$(shell pwd)
+
+.PHONY: clean install
+
+SUBDIRS :=
+
+FILES :=
+
+
+
14 years, 3 months