Changeset 642

Timestamp:

Oct 21, 2007 2:36:50 AM (12 years ago)

Author:

jpfasano

Message:

Osi's unitTest is now considered a success if Sym completes 89 out of 90 netlib testcases

Location:

branches/testScripts

Files:

• NBcheckResult.py (modified) (7 diffs)
• NBemail.py (modified) (2 diffs)
• nightlyBuild.py (modified) (2 diffs)

branches/testScripts/NBcheckResult.py

@@ -13 +13 @@
 #------------------------------------------------------------------------
 def didTestFail( result, project, buildStep ) :
-  retVal = 0
+  retVal = None
 
   # If the return code is not 0, then failure
   if result['returnCode'] != 0 :
-    retVal = 1
+    retVal = "Non-zero return code of "+result['returnCode']
 
   # Many tests write a "Success" message.
@@ -27 +27 @@
          result['stdout'].rfind("All tests completed successfully") == -1 :
         # Success message not found, assume test failed
-        retVal = 1
+        retVal = "The output does not contain the messages: 'All tests completed successfully'"
 
   #---------------------------------------------------------------------
@@ -41 +41 @@
     if not re.compile(reexp).match(msgTail,1) :
       # message not found, assume test failed
-      retVal = 1
+      retVal = "Did not complete the woodw testcase"
       
   # Cbc's "make test"
@@ -51 +51 @@
     if not re.compile(reexp).match(msgTail,1) :
       # message not found, assume test failed
-      retVal = 1
+      retVal = "Did not dispaly message 'cbc_clp solved 2 out of 2 and took XX.XX seconds.'" 
 
   # Cbc's "./cbc -unitTest dirNetlib=_MIPLIB3DIR_ -miplib"
@@ -60 +60 @@
       # ended because maxnodes limit reached.  John Forrest says if this
       # is less than 3, the OK.
-      retVal=0
+      retVal=None
     else :
-      retVal=1
+      retVal = "Return code of "+result['returnCode']+" which is > 2."
 
   # DyLP's "make test"
@@ -77 +77 @@
     if re.compile(reexp).match(result['stderr'],1) :
       # message found, assume test failed
-      retVal = 1
+      retVal = "Issued message: 'SolverInterface tessting issue:'"
     if re.compile(reexp).match(result['stdout'],1) :
       # message found, assume test failed
-      retVal = 1
+      retVal = "Issued message: 'SolverInterface tessting issue:'"
 
     if project=='DyLP' and buildStep==NBprojectConfig.UNITTEST_CMD['Osi'] or \
@@ -88 +88 @@
       r=r'((.+) solved (\d+) out of 90 and took (\d*\.\d*) seconds)'
       osisSummaryResult=re.findall(r,result['stdout'][-800:])
+      expectedOsis=['clp','sym','dylp','cbcclp']
       for osi in osisSummaryResult :
-        if int(osi[2])<90 :
-          #print osi[1]+" ran "+osi[2]+" out of 90 in "+osi[3]+" seconds"
-          retVal=1
+        if osi[1] in expectedOsis: expectedOsis.remove(osi[1])
+        numSolved = int(osi[2])
+        # Sym only solves 89 of the 90
+        if osi[1]=='sym':
+          if numSolved<89 :
+            retVal=osi[1]+\
+                 " only solved "\
+                 +osi[2]\
+                 +" out of 90 in "\
+                 +osi[3]+" seconds"
+        elif numSolved<90 :
+          retVal=osi[1]+\
+                 " only solved "\
+                 +osi[2]+\
+                 " out of 90 in "\
+                 +osi[3]+" seconds"
+      if len(expectedOsis)!=0 :
+        retVal="Osi "+expectedOsis[0]+" did not report number solved"
 
   return retVal

branches/testScripts/NBemail.py

@@ -51 +51 @@
     emailMsg += "PATH: "+os.environ["PATH"]+"\n"
 
+  if cmdMsgs.has_key('make test') :
+    emailMsg += "\n\n'make test' problem:\n"
+    emailMsg += cmdMsgs['make test']
+    emailMsg += "\n" 
+  if cmdMsgs.has_key('unitTest') :
+    emailMsg += "\n\nDetected problem:\n"
+    emailMsg += cmdMsgs['unitTest']
+    emailMsg += "\n" 
+
   emailMsg +="\n"
 
@@ -60 +69 @@
     emailMsg += "\n\nconfig.log messages are:\n"
     emailMsg += cmdMsgs['config.log']
+
   send(toAddrs,subject,emailMsg)
   NBlogMessages.writeMessage( "  email sent regarding "+project+" running '"+cmd+"'" )

branches/testScripts/nightlyBuild.py

@@ -136 +136 @@
   
   # Check if 'make test' worked
-  if NBcheckResult.didTestFail(result,p,"make test") :
+  didMakeTestFail=NBcheckResult.didTestFail(result,p,"make test")
+  if didMakeTestFail :
+    result['make test']=didMakeTestFail
     NBemail.sendCmdMsgs(p,result,"make test")
     continue
@@ -154 +156 @@
     result=NBosCommand.run(unitTestCmd)
   
-    if NBcheckResult.didTestFail(result,p,unitTestCmdTemplate) :
+    didUnitTestFail=NBcheckResult.didTestFail(result,p,unitTestCmdTemplate)
+    if didUnitTestFail :
+      result['unitTest']=didUnitTestFail
       NBemail.sendCmdMsgs(p,result,unitTestCmd)
       continue