commit 9062761c64ae45c8f8f211e147e6760e55f97906
author Jon Hall <jhall@onlab.us> Tue Jun 09 14:57:02 2015 -0700
committer Jon Hall <jhall@onlab.us> Tue Jun 09 14:57:02 2015 -0700
tree afeb17c2c92f491b2d2fcbb71e6380573d012f72
parent 8ce34e8efb999578691d3ea8ccb0d9d714ef16d6

Add onfail message to summary logs

TestON/core/teston.py

diff --git a/TestON/core/teston.py b/TestON/core/teston.py
index ba4e74f..271c0dd 100644
--- a/TestON/core/teston.py
+++ b/TestON/core/teston.py
@@ -264,6 +264,8 @@
                     self.log.wiki( "<li>" + line + "  <ac:emoticon ac:name=\"cross\" /></li>\n" )
                 elif re.search( " - No Result$", line ):
                     self.log.wiki( "<li>" + line + "  <ac:emoticon ac:name=\"warning\" /></li>\n" )
+                else:  # Should only be on fail message
+                    self.log.wiki( "<ul><li>" + line + "</li></ul>\n" )
             self.log.wiki( "</ul>" )
             self.log.summary( self.stepCache )
             self.stepCache = ""
@@ -274,6 +276,7 @@
             try :
                 step = stepList[self.stepCount]
                 self.STEPRESULT = self.NORESULT
+                self.onFailMsg = "\t\tNo on fail message given"
                 exec code[testCaseNumber][step] in module.__dict__
                 self.stepCount = self.stepCount + 1
                 if step > 0:
@@ -283,6 +286,7 @@
                     elif self.STEPRESULT == self.FALSE:
                         self.stepCache += "FAIL\n"
                         # TODO: Print the on-fail statement here
+                        self.stepCache += "\t\t" + self.onFailMsg + "\n"
                     else:
                         self.stepCache += "No Result\n"
                     self.stepResults.append(self.STEPRESULT)
@@ -302,6 +306,8 @@
                         self.log.wiki( "<li>" + line + "  <ac:emoticon ac:name=\"cross\" /></li>\n" )
                     elif re.search( " - No Result$", line ):
                         self.log.wiki( "<li>" + line + "  <ac:emoticon ac:name=\"warning\" /></li>\n" )
+                    else:  # Should only be on fail message
+                        self.log.wiki( "<ul><li>" + line + "</li></ul>\n" )
                 self.log.wiki( "</ul>" )
                 #summary results
                 self.log.summary( self.stepCache )

TestON/core/utilities.py

diff --git a/TestON/core/utilities.py b/TestON/core/utilities.py
index 8cb681d..1ba403d 100644
--- a/TestON/core/utilities.py
+++ b/TestON/core/utilities.py
@@ -172,6 +172,7 @@
             else :
                 main.log.error(arguments["ONFAIL"])
                 main.log.report(arguments["ONFAIL"])
+                main.onFailMsg = arguments[ 'ONFAIL' ]
 
         msg = arguments["ON" + str(resultString)]