Author: gnichols
Date: 2010-06-16 21:14:36 +0000 (Wed, 16 Jun 2010)
New Revision: 554
Modified:
trunk/v7/daemon.py
Log:
568518 - FEAT: add a BMC fencing testing
Modified: trunk/v7/daemon.py
===================================================================
--- trunk/v7/daemon.py 2010-06-15 17:30:40 UTC (rev 553)
+++ trunk/v7/daemon.py 2010-06-16 21:14:36 UTC (rev 554)
@@ -93,26 +93,53 @@
taskOutFile.close()
else:
print "unsupported command: " + line
-
- def serverTest(self, line):
- """ run server-side test code per client/SUT request
"""
+ def __parseRequest(self, line):
args = dict()
word=line.split()[3:]
i = 0
while i+1 < len(word):
args[word[i][2:]] = word[i+1]
- i += 1
+ i += 2
+ return args
+
+ def openLogFile(self, args, mode):
+ logFileName = "v7-daemon-"
+ for (key, value) in args.items():
+ if key != "results":
+ logFileName = logFileName + "%s=%s_"
+ log = open(os.path.join(self.environment.getLogDirectory(), logFileName), mode)
+ return log
+
+ def serverTest(self, line):
+ """ run server-side test code per client/SUT request
"""
+ args = self.__parseRequest(line)
+ # if it's a results request, find the log
+ try:
+ if len(args["results"]) > 0:
+ log = self.openLogFile(args, "r")
+ taskOutFile = open(self.environment.getTaskFilePath()+ ".out",
'w')
+ for line in log:
+ taskOutFile.write(line + "\n")
+ taskOutFile.close()
+ log.close()
+ return True
+ except Exception, e:
+ pass
+
+ # otherwise, queue he request
taskOutFile = open(self.environment.getTaskFilePath()+ ".out",
'w')
- taskOutFile.write("Running test " + args["test"] +
"\n")
+ taskOutFile.write("Queuing request for test " + args["test"]
+ "\n")
+ taskOutFile.close()
result = True
try:
test = self.planner.getTest(args["test"])
- test.runOnServer(args, taskOutFile)
+ log = self.openLogFile(args, "w")
+ test.runOnServer(args, log)
+ log.close()
except KeyError:
print "Error: test not found"
result = False
- taskOutFile.close()
return result
\ No newline at end of file
Show replies by date