r922 - trunk/tests/fencing
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-28 20:02:49 +0000 (Thu, 28 Apr 2011)
New Revision: 922
Modified:
trunk/tests/fencing/fencing.py
Log:
641157 - Fencing test gives result of AUTO when run, instead of PASS or FAIL
Modified: trunk/tests/fencing/fencing.py
===================================================================
--- trunk/tests/fencing/fencing.py 2011-04-28 20:02:11 UTC (rev 921)
+++ trunk/tests/fencing/fencing.py 2011-04-28 20:02:49 UTC (rev 922)
@@ -16,7 +16,7 @@
import os, string, sys, time, syslog, urllib2
-from v7.tags import Constants, DeviceClass
+from v7.tags import Constants, DeviceClass, TestTag
from v7.test import Test
from v7.command import Command, V7CommandException
from v7.controller import Controller
@@ -29,6 +29,7 @@
def __init__(self):
Test.__init__(self, name="fencing")
+ self.interactive = False
self.deviceClass = DeviceClass.system
self.environment = Environment()
self.continuation = Continuation(self.environment)
@@ -37,6 +38,9 @@
self.url = "/v7/cgi/v7web.py?command=daemon&subcommand=run&test=fencing"
self.agent = None
+ def tags(self):
+ return [TestTag.noninteractive, TestTag.certification]
+
def plan(self, devices):
tests = list()
# manual planning only, for now
13 years
r921 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-28 20:02:11 +0000 (Thu, 28 Apr 2011)
New Revision: 921
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-04-28 20:01:28 UTC (rev 920)
+++ trunk/v7.spec.in 2011-04-28 20:02:11 UTC (rev 921)
@@ -71,6 +71,10 @@
%changelog
* Thu Apr 28 2011 Greg Nichols <gnichols(a)redhat.com>
+V7 1.3 R39
+
+ 641157 - Fencing test gives result of AUTO when run, instead of PASS or FAIL
+
V7 1.3 R38
679011 - fencing test fail on v7-1.3-10
13 years
r920 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-28 20:01:28 +0000 (Thu, 28 Apr 2011)
New Revision: 920
Modified:
trunk/Makefile
Log:
R39
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-28 17:29:11 UTC (rev 919)
+++ trunk/Makefile 2011-04-28 20:01:28 UTC (rev 920)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 38
+V7_RELEASE := 39
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
r919 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-28 17:29:11 +0000 (Thu, 28 Apr 2011)
New Revision: 919
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-04-28 17:27:55 UTC (rev 918)
+++ trunk/v7.spec.in 2011-04-28 17:29:11 UTC (rev 919)
@@ -69,6 +69,12 @@
%changelog
+* Thu Apr 28 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R38
+
+ 679011 - fencing test fail on v7-1.3-10
+
* Mon Apr 25 2011 Greg Nichols <gnichols@redhat,com>
V7 1.3 R37
13 years
r918 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-28 17:27:55 +0000 (Thu, 28 Apr 2011)
New Revision: 918
Modified:
trunk/Makefile
Log:
R38
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-28 17:27:13 UTC (rev 917)
+++ trunk/Makefile 2011-04-28 17:27:55 UTC (rev 918)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 37
+V7_RELEASE := 38
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
r917 - trunk/tests/fencing
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-28 17:27:13 +0000 (Thu, 28 Apr 2011)
New Revision: 917
Modified:
trunk/tests/fencing/fencing.py
Log:
679011 - fencing test fail on v7-1.3-10
Modified: trunk/tests/fencing/fencing.py
===================================================================
--- trunk/tests/fencing/fencing.py 2011-04-26 15:26:36 UTC (rev 916)
+++ trunk/tests/fencing/fencing.py 2011-04-28 17:27:13 UTC (rev 917)
@@ -64,6 +64,7 @@
return "&agentIP=" + self.agent.getIP() + "&agentType=" + self.agent.getType() + "&agentUser=" + self.agent.getUser() +"&agentPassword=" + self.agent.getPassword() + "&subtest=" + self.agent.getSubTest()
def sendFencingRequest(self, subtest):
+ self.waitForLull()
request = self.url + self.getAgentParameters()
print "Sending Request:"
print request
@@ -83,7 +84,7 @@
print "Please wait for test to continue"
sys.stdout.flush()
- # wait here for reboot
+ # wait here for reboot
waitTime = 60 #sec
print "Waiting %u sec, for shutdown..." % waitTime
sys.stdout.flush()
@@ -137,7 +138,7 @@
if not result:
self.agent.setSummary(Constants.FAIL)
self.agent.save(os.path.join(self.environment.getDataDirectory(), "agent.xml"))
- self.continuation.setInitConfig("fencing-powercycle")
+ self.continuation.setInitConfig("fencing-powercycle", "powercycle")
result = self.sendFencingRequest("powercycle")
else:
print "Error: could not recover agent info on continuation after reboot/powercycle"
@@ -145,7 +146,7 @@
self.continuation.removeInitConfig()
else:
if self.getAgentInfo("reboot"):
- self.continuation.setInitConfig("fencing-reboot")
+ self.continuation.setInitConfig("fencing-reboot", "reboot")
result = self.sendFencingRequest("reboot")
else:
result = False
@@ -185,7 +186,7 @@
fenceCommand = Command(self.getAgentCommand(args) + " -o status ")
self.log("running: " + fenceCommand.command, outFile)
- fenceCommand.echo()
+ fenceCommand.echoIgnoreErrors() # status will return 2 if system is off
self.logCommand(fenceCommand.output, outFile)
fenceCommand = Command(self.getAgentCommand(args) + " -o on ")
13 years
r916 - in tags: . v7-V1-3R37/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-26 15:26:36 +0000 (Tue, 26 Apr 2011)
New Revision: 916
Added:
tags/v7-V1-3R37/
tags/v7-V1-3R37/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R37/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R37/v7/version.py (rev 0)
+++ tags/v7-V1-3R37/v7/version.py 2011-04-26 15:26:36 UTC (rev 916)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '37'
+rhel_version = '6'
13 years
r915 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-26 15:24:50 +0000 (Tue, 26 Apr 2011)
New Revision: 915
Modified:
trunk/v7.spec.in
Log:
698984 - v7 sets /var/v7/store as world-writeable
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-04-26 15:23:56 UTC (rev 914)
+++ trunk/v7.spec.in 2011-04-26 15:24:50 UTC (rev 915)
@@ -61,15 +61,17 @@
/usr/bin/v7-report-result
/usr/bin/v7
/usr/share/v7
-/var/v7/
+# set to user apache for web/cgi serving
+%attr(-, apache, apache) /var/v7
/etc/httpd/conf.d/v7.conf
/usr/share/man/man8/v7.8.gz
/etc/init.d/v7
+
%changelog
* Mon Apr 25 2011 Greg Nichols <gnichols@redhat,com>
-V7 1.3 R36
+V7 1.3 R37
698984 - v7 sets /var/v7/store as world-writeable
13 years
r914 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-26 15:23:56 +0000 (Tue, 26 Apr 2011)
New Revision: 914
Modified:
trunk/Makefile
Log:
R37
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-04-26 15:22:45 UTC (rev 913)
+++ trunk/Makefile 2011-04-26 15:23:56 UTC (rev 914)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 36
+V7_RELEASE := 37
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
r913 - trunk/test-env/www/cgi
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-04-26 15:22:45 +0000 (Tue, 26 Apr 2011)
New Revision: 913
Modified:
trunk/test-env/www/cgi/Makefile
Log:
back out change for 698984
Modified: trunk/test-env/www/cgi/Makefile
===================================================================
--- trunk/test-env/www/cgi/Makefile 2011-04-25 16:11:40 UTC (rev 912)
+++ trunk/test-env/www/cgi/Makefile 2011-04-26 15:22:45 UTC (rev 913)
@@ -28,7 +28,6 @@
rm -rf $(DESTDIR)/var/v7/cgi
mkdir -p $(DESTDIR)/var/v7/cgi
mkdir -p $(DESTDIR)/var/v7/store
- chown apache:apache $(DESTDIR)/var/v7/store
for file in $(FILES); do cp -f $$file $(DESTDIR)/var/v7/cgi/$$file; done
for i in $(SUBDIRS); do $(MAKE) -C $$i V7_CATALOG_CSS_COPY=$(V7_CATALOG_CSS_COPY) install; done
mkdir -p $(DESTDIR)/etc/httpd/conf.d
13 years