r902 - trunk/tests/reboot
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 13:57:24 +0000 (Tue, 19 Apr 2011)
New Revision: 902
Modified:
trunk/tests/reboot/reboot.py
Log:
697863 - multiple reboot tests are not run correctly
Modified: trunk/tests/reboot/reboot.py
===================================================================
--- trunk/tests/reboot/reboot.py 2011-04-19 13:57:09 UTC (rev 901)
+++ trunk/tests/reboot/reboot.py 2011-04-19 13:57:24 UTC (rev 902)
@@ -288,7 +288,7 @@
PASSED = 0
FAILED = 1
- if self.incomplete:
+ if self.incomplete and self.continuation.isInitialized():
self.markOutput("verify")
result = self.continuation.verify(marker=self.Name())
self.continuation.removeInitConfig()
13 years
r901 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 13:57:09 +0000 (Tue, 19 Apr 2011)
New Revision: 901
Modified:
trunk/v7/continuation.py
trunk/v7/hardwaretest.py
Log:
697863 - multiple reboot tests are not run correctly
Modified: trunk/v7/continuation.py
===================================================================
--- trunk/v7/continuation.py 2011-04-19 13:47:06 UTC (rev 900)
+++ trunk/v7/continuation.py 2011-04-19 13:57:09 UTC (rev 901)
@@ -34,6 +34,7 @@
self.method = None
self.timestamp = None
self.kernel = None
+ self.bootPrintPath = os.path.join(self.environment.getDataDirectory(), "bootprint")
def setInitConfig(self, marker, method=None):
@@ -45,7 +46,7 @@
theTime = time.localtime(time.time())
self.timestamp = self.documentWrapper.timeToString(theTime)
# save it off to the side
- timestamp = open(os.path.join(self.environment.getDataDirectory(), "bootprint"), "w")
+ timestamp = open(self.bootPrintPath, "w")
timestamp.write(self.timestamp + "\n")
if self.method:
timestamp.write(self.method + "\n")
@@ -59,12 +60,14 @@
chkconfig = Command("chkconfig --del v7")
chkconfig.echo()
+ def isInitialized(self):
+ return os.path.exists(self.bootPrintPath)
def verify(self, marker, maxReboots=1):
# get the log, verify rboot happened
runTimeStamp = None
try:
- timestamp = open(os.path.join(self.environment.getDataDirectory(), "bootprint"))
+ timestamp = open(self.bootPrintPath)
self.timestamp = timestamp.readline().strip()
method = timestamp.readline()
if method:
@@ -72,8 +75,9 @@
kernel = timestamp.readline()
if kernel:
self.kernel = kernel.strip()
+ timestamp.close()
+ os.remove(self.bootPrintPath)
- timestamp.close()
theTime = time.localtime(time.time())
duration = self.documentWrapper.duration(self.timestamp, self.documentWrapper.timeToString(theTime))
print "reboot took " + duration
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-04-19 13:47:06 UTC (rev 900)
+++ trunk/v7/hardwaretest.py 2011-04-19 13:57:09 UTC (rev 901)
@@ -793,14 +793,18 @@
requestedTests.append(mandatoryTest)
# reboot test is a special case - really needs to run last
- try:
- reboot = requestedTestDict["reboot"]
- requestedTests.remove(reboot)
- requestedTests.append(reboot)
- except:
- pass
-
-
+ tests = list()
+ rebootTests = list()
+ for test in requestedTests:
+ if test.getName() != "reboot":
+ tests.append(test)
+ else:
+ rebootTests.append(test)
+ if rebootTests:
+ tests.extend(rebootTests)
+ return tests
+
+ # otherwise - debugging - don't add any tests
return requestedTests
def doCertify(self):
13 years
r900 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 13:47:06 +0000 (Tue, 19 Apr 2011)
New Revision: 900
Modified:
trunk/Makefile
Log:
R34
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-19 12:46:49 UTC (rev 899)
+++ trunk/Makefile 2011-04-19 13:47:06 UTC (rev 900)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 33
+V7_RELEASE := 34
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
r899 - in tags: . v7-V1-3R33/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 12:46:49 +0000 (Tue, 19 Apr 2011)
New Revision: 899
Added:
tags/v7-V1-3R33/
tags/v7-V1-3R33/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R33/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R33/v7/version.py (rev 0)
+++ tags/v7-V1-3R33/v7/version.py 2011-04-19 12:46:49 UTC (rev 899)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '33'
+rhel_version = '6'
13 years
r898 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 12:46:04 +0000 (Tue, 19 Apr 2011)
New Revision: 898
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-04-19 12:45:05 UTC (rev 897)
+++ trunk/v7.spec.in 2011-04-19 12:46:04 UTC (rev 898)
@@ -67,6 +67,12 @@
/etc/init.d/v7
%changelog
+* Tue Apr 19 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R33
+
+ 697846 - info test logs missing when reboot test is run
+
* Mon Apr 18 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R32
13 years
r897 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 12:45:05 +0000 (Tue, 19 Apr 2011)
New Revision: 897
Modified:
trunk/Makefile
Log:
R33
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-19 12:44:43 UTC (rev 896)
+++ trunk/Makefile 2011-04-19 12:45:05 UTC (rev 897)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 32
+V7_RELEASE := 33
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
r896 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 12:44:43 +0000 (Tue, 19 Apr 2011)
New Revision: 896
Modified:
trunk/v7/hardwaretest.py
Log:
697846 - info test logs missing when reboot test is run
Modified: trunk/v7/hardwaretest.py
===================================================================
--- trunk/v7/hardwaretest.py 2011-04-19 03:03:19 UTC (rev 895)
+++ trunk/v7/hardwaretest.py 2011-04-19 12:44:43 UTC (rev 896)
@@ -717,9 +717,8 @@
run.setSummary(summary)
run.getResultsAttachments(self.environment, outputFilePath)
- self.certification.save(self.environment.getResultsPath())
- print "saved to " + self.environment.getResultsPath()
+
if self.options.rhts:
self.reportToRHTS(test, run.getSummary(), outputFilePath)
@@ -743,7 +742,9 @@
# print result
print ("Return value was %u") % returnValue
# TODO: clean up tmpdir here?
-
+ self.certification.save(self.environment.getResultsPath())
+ print "saved to " + self.environment.getResultsPath()
+
syslog.syslog("Testing complete.")
syslog.closelog()
self.certification.save(self.environment.getResultsPath())
13 years
r895 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 03:03:19 +0000 (Tue, 19 Apr 2011)
New Revision: 895
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-04-19 03:02:14 UTC (rev 894)
+++ trunk/v7.spec.in 2011-04-19 03:03:19 UTC (rev 895)
@@ -68,7 +68,10 @@
%changelog
* Mon Apr 18 2011 Greg Nichols <gnichols(a)redhat.com>
+V7 1.3 R32
+ 696873 - The info test of v7-1.3.19beta is always incomplete and without a exit code.
+
V7 1.3 R31
626970 - FEAT: kdump test needs to verify kdump
13 years
r894 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 03:02:14 +0000 (Tue, 19 Apr 2011)
New Revision: 894
Modified:
trunk/Makefile
Log:
R32
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-19 03:01:29 UTC (rev 893)
+++ trunk/Makefile 2011-04-19 03:02:14 UTC (rev 894)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 31
+V7_RELEASE := 32
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
r893 - trunk/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-19 03:01:29 +0000 (Tue, 19 Apr 2011)
New Revision: 893
Modified:
trunk/v7/rundocument.py
Log:
696873 - The info test of v7-1.3.19beta is always incomplete and without a exit code.
Modified: trunk/v7/rundocument.py
===================================================================
--- trunk/v7/rundocument.py 2011-04-18 18:06:38 UTC (rev 892)
+++ trunk/v7/rundocument.py 2011-04-19 03:01:29 UTC (rev 893)
@@ -137,6 +137,7 @@
output += "End Section\n"
elif node.nodeType == node.TEXT_NODE:
output += node.data
+ output += "\n"
return output
def setTestOutputXXX(self, output):
13 years