Changeset 720 for branches

Timestamp:

Oct 28, 2007 10:36:08 AM (14 years ago)

Author:

jpfasano

Message:

Commit is to copy file from my window to linux box.
Starting to clean up code which checks for success of "make test" and unitTest

Location:

branches/testScripts

Files:

• NBcheckResult.py (modified) (3 diffs)
• NBprojectConfig.py (modified) (3 diffs)

branches/testScripts/NBcheckResult.py

@@ -11 +11 @@
 import NBprojectConfig
 
-
 #------------------------------------------------------------------------
 # Determine if a projects "make test" or unitTest ran successfully.
@@ -17 +16 @@
 # this function has specialized code for some projects.
 #------------------------------------------------------------------------
+
+def rc0( result, project ) :
+  retVal = None
+  # If the return code is not 0, then failure
+  if result['returnCode'] != 0 :
+    retVal = "Non-zero return code of "+str(result['returnCode'])
+
+def standardSuccessMessage(result,project) :
+  retVal = None
+  # Is the success message contained in the output?
+  if result['stderr'].rfind("All tests completed successfully") == -1 and \
+     result['stdout'].rfind("All tests completed successfully") == -1 :
+    # Success message not found, assume test failed
+    retVal = "The output does not contain the messages: 'All tests completed successfully'"
+
+
+
 def didTestFail( result, project, buildStep ) :
   retVal = None
 
   # If the return code is not 0, then failure
-  if result['returnCode'] != 0 :
-    retVal = "Non-zero return code of "+str(result['returnCode'])
+  retVal=rc0(result,project)
+  if retVal : return retVal
 
   # Many tests write a "Success" message.
@@ -28 +44 @@
   if NBprojectConfig.ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS.has_key(project) : 
     if buildStep in NBprojectConfig.ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS[project] :
-      # Is the success message contained in the output?
-      if result['stderr'].rfind("All tests completed successfully") == -1 and \
-         result['stdout'].rfind("All tests completed successfully") == -1 :
-        # Success message not found, assume test failed
-        retVal = "The output does not contain the messages: 'All tests completed successfully'"
+      retVal= standardSucessMessage(result,project)
+      if retVal : return retVal
 
   #---------------------------------------------------------------------

branches/testScripts/NBprojectConfig.py

@@ -7 +7 @@
 
 import os
+import NBcheckResult
 
 #----------------------------------------------------------------------
@@ -18 +19 @@
 UNITTEST_CMD = {}
 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS = {}
+CHECK_MAKE_TEST = {}
+CHECK_UNITTEST = {}
 
 
@@ -24 +27 @@
 PROJECT_EMAIL_ADDRS['CoinUtils'] = 'ladanyi _AT_ us _DOT_ ibm _DOT_ com'
 ALL_TESTS_COMPLETED_SUCCESSFULLY_CMDS['CoinUtils'] = ['make test']
+CHECK_MAKE_TEST['CoinUtils']=[NBcheckRsult.rc0,NBcheckResult.standardSuccessMessage]
 #does not have references to third party packages