r892 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 18:06:38 +0000 (Mon, 18 Apr 2011)
New Revision: 892
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-04-18 18:05:59 UTC (rev 891)
+++ trunk/v7.spec.in 2011-04-18 18:06:38 UTC (rev 892)
@@ -69,7 +69,7 @@
%changelog
* Mon Apr 18 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.3 R30
+V7 1.3 R31
626970 - FEAT: kdump test needs to verify kdump
697017 - video test uses xdpyinfo and should require xorg-x11-utils
13 years
r891 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 18:05:59 +0000 (Mon, 18 Apr 2011)
New Revision: 891
Modified:
trunk/Makefile
Log:
R31
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-18 18:05:20 UTC (rev 890)
+++ trunk/Makefile 2011-04-18 18:05:59 UTC (rev 891)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 30
+V7_RELEASE := 31
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
r890 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 18:05:20 +0000 (Mon, 18 Apr 2011)
New Revision: 890
Modified:
trunk/v7/configfile.py
Log:
635973 - reboot test should set vmcore size before testing kdump
Modified: trunk/v7/configfile.py
===================================================================
--- trunk/v7/configfile.py 2011-04-18 16:45:12 UTC (rev 889)
+++ trunk/v7/configfile.py 2011-04-18 18:05:20 UTC (rev 890)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
#
-# parse simple configles of the form:
+# parse simple config files of the form:
# <parametername> <value(s)>
@@ -63,14 +63,20 @@
def removeParameter(self, name):
if self.getParameter(name):
del self.parameters[name]
+ saveLines = list()
for line in self.lines:
- # skip comment lines
+ # skip/preserve comment lines
if line.strip() and line.strip()[0] == "#":
+ saveLines.append(line)
continue
- words = line.strip().split(" ")
- if words[0] and words[0] == name:
- self.lines.remove(line)
- self.modified = True
+ words = line.strip().split(" ")
+ if words and words[0] == name:
+ self.modified = True
+ else:
+ saveLines.append(line)
+ if self.modified:
+ self.lines = saveLines
+
def save(self):
if self.modified:
@@ -80,8 +86,16 @@
if __name__ == "__main__":
try:
- confFile = ConfigFile("/etc/rc.local")
+ confFile = ConfigFile("qq.txt")
+ confFile.removeParameter("net")
+ confFile.save()
+ print "------------------------"
confFile.dump()
+ confFile = ConfigFile("qq.txt")
+ confFile.addParameter("net", "asd")
+ confFile.save()
+ print "------------------------"
+ confFile.dump()
except Exception, exception:
print exception
exit(1)
13 years
r889 - in tags: . v7-V1-3R30/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 16:45:12 +0000 (Mon, 18 Apr 2011)
New Revision: 889
Added:
tags/v7-V1-3R30/
tags/v7-V1-3R30/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R30/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R30/v7/version.py (rev 0)
+++ tags/v7-V1-3R30/v7/version.py 2011-04-18 16:45:12 UTC (rev 889)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '30'
+rhel_version = '6'
13 years
r888 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 16:44:37 +0000 (Mon, 18 Apr 2011)
New Revision: 888
Modified:
trunk/v7.spec.in
Log:
changlog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-04-18 16:44:02 UTC (rev 887)
+++ trunk/v7.spec.in 2011-04-18 16:44:37 UTC (rev 888)
@@ -69,12 +69,13 @@
%changelog
* Mon Apr 18 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.3 R29
+V7 1.3 R30
626970 - FEAT: kdump test needs to verify kdump
697017 - video test uses xdpyinfo and should require xorg-x11-utils
649520 - fv_* tests are not being planned on 32-bit RHEL5.5
693429 - v7: clocktest only works up to 1024p
+ 649314 - v7 returns 1 on successful run
* Thu Apr 14 2011 Greg Nichols <gnichols(a)redhat.com>
@@ -201,7 +202,6 @@
V7 1.3 R1
- 649314 - v7 returns 1 on successful run
649729 - RHEL5 fv_tests may fail on initial run due to kvm modules not installed
642029 - USB SCSI tape drives cause: UnicodeEncodeError
13 years
r887 - trunk/tests/reboot
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 16:44:02 +0000 (Mon, 18 Apr 2011)
New Revision: 887
Modified:
trunk/tests/reboot/reboot.py
Log:
626970 - FEAT: kdump test needs to verify kdump
Modified: trunk/tests/reboot/reboot.py
===================================================================
--- trunk/tests/reboot/reboot.py 2011-04-18 16:43:08 UTC (rev 886)
+++ trunk/tests/reboot/reboot.py 2011-04-18 16:44:02 UTC (rev 887)
@@ -53,8 +53,8 @@
return tests
def verify(self):
- if self.getLogicalDevice == Constants.nfs and (self.getTestServer() == None or self.getTestServer() == "unknown"):
- print "Reboot test for %s failed verification: No test server was set." % self.getLogicalDevice()
+ if self.getLogicalDeviceName() == Constants.nfs and (self.getTestServer() == None or self.getTestServer() == "unknown"):
+ print "Reboot test for %s failed verification: No test server was set." % self.getLogicalDeviceName()
return False
return True
@@ -127,7 +127,7 @@
else:
print "Network Dump set to %s" % net
elif self.getLogicalDeviceName() == Constants.nfs:
- if self.getTestServer():
+ if self.getTestServer() and self.getTestServer() != "unknown":
net = "%s:/var/v7/export" % self.getTestServer()
print "Adding net %s to %s" % (net, self.kdumpConfigPath)
configFile.addParameter("net", net)
@@ -210,7 +210,7 @@
def verifyKDumpImage(self):
imageDirectory = self.getImageDirectory()
- if not imageDirectory():
+ if not imageDirectory:
return False
# find the vmcore image file matching the timestamp
@@ -265,12 +265,15 @@
# if nfs network dump, mount the filesystem
net = configFile.getParameter("net")
if net:
- print "Attempting to mount net setting %s as nfs."
+ print "Attempting to mount net setting %s as nfs." % net
try:
localPath = "v7-net"
Command("mkdir %s" % localPath).echo()
- Command("mount %s %s" % (net, localPath).echo())
- imageDirectory = os.path.join(localPath, imageDirectory)
+ Command("mount %s %s" % (net, localPath)).echo()
+ if os.path.isabs(imageDirectory):
+ imageDirectory = localPath + imageDirectory
+ else:
+ imageDirectory = os.path.join(localPath, imageDirectory)
except V7CommandException, exception:
print "Error: could not mount nfs image directory"
print exception
13 years
r886 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 16:43:08 +0000 (Mon, 18 Apr 2011)
New Revision: 886
Modified:
trunk/v7/configfile.py
Log:
626970 - FEAT: kdump test needs to verify kdump
Modified: trunk/v7/configfile.py
===================================================================
--- trunk/v7/configfile.py 2011-04-18 14:52:08 UTC (rev 885)
+++ trunk/v7/configfile.py 2011-04-18 16:43:08 UTC (rev 886)
@@ -22,7 +22,7 @@
def __init__(self, filePath):
self.filePath = filePath
- self.parameters = None
+ self.parameters = dict()
self.__parse()
self.modified = False
@@ -35,8 +35,6 @@
continue
words = line.strip().split(" ")
if words[0]:
- if not self.parameters:
- self.parameters = dict()
self.parameters[words[0]] = " ".join(words[1:])
file.close()
@@ -56,7 +54,7 @@
def addParameter(self, name, value):
if not self.getParameter(name):
self.parameters[name] = value
- self.lines.append("%s %s\n" % name, value)
+ self.lines.append("%s %s\n" % (name, value))
self.modified = True
return True
# otherwise
13 years
r885 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 14:52:08 +0000 (Mon, 18 Apr 2011)
New Revision: 885
Modified:
trunk/v7/hardwaretest.py
Log:
649314 - v7 returns 1 on successful run
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-04-18 14:51:00 UTC (rev 884)
+++ trunk/v7/hardwaretest.py 2011-04-18 14:52:08 UTC (rev 885)
@@ -900,7 +900,7 @@
def doSubmit(self):
self.load()
- self.__submit()
+ return self.__submit()
def __submit(self):
if self.certification and self.certification.getNumberOfTestRuns() > 0:
@@ -919,7 +919,7 @@
def doSave(self):
self.load()
- self.__save()
+ return self.__save()
def __save(self):
13 years
r884 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 14:51:00 +0000 (Mon, 18 Apr 2011)
New Revision: 884
Modified:
trunk/Makefile
Log:
R30
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-18 13:35:12 UTC (rev 883)
+++ trunk/Makefile 2011-04-18 14:51:00 UTC (rev 884)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 29
+V7_RELEASE := 30
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
r883 - in tags: . v7-V1-3R29/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-18 13:35:12 +0000 (Mon, 18 Apr 2011)
New Revision: 883
Added:
tags/v7-V1-3R29/
tags/v7-V1-3R29/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R29/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R29/v7/version.py (rev 0)
+++ tags/v7-V1-3R29/v7/version.py 2011-04-18 13:35:12 UTC (rev 883)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '29'
+rhel_version = '6'
13 years