r917 - trunk/tests/fencing
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 ")