Show diff error in test failure exception

With Python 2.6, the unittest.TestCase.assertEqual() function (and all the
other assert functions), take an optional 'msg' argument.  With this, I can
show the grep failure message right in the test failure exception.  This just
makes it much easier to see the details of the failures.

Author: Roscoe A. Bartlett

test/ci_support/CheckinTest_UnitTests.py

@@ -80,12 +80,13 @@ def assertGrepFileForRegexStrList(testObject, testName, fileName, regexStrList,
   for regexToFind in regexStrList.strip().split('\n'):
     if regexToFind == "": continue
     foundRegex = getCmndOutput("grep '"+regexToFind+"' "+fileName, True, False)
-    if verbose or not foundRegex:
-      print "\n"+testName+": In '"+fileName+"' look for regex '"+regexToFind+"' ...", 
-      print "'"+foundRegex+"'", 
-      if foundRegex: print ": PASSED"
-      else: print ": FAILED"
-    testObject.assertNotEqual(foundRegex, "")
+    msg = "\n"+testName+": In '"+fileName+"' look for regex '"+regexToFind+"' ..." \
+      + "'"+foundRegex+"'" 
+    if foundRegex: msg += ": PASSED"
+    else: msg += ": FAILED"
+    if verbose:
+      print msg
+    testObject.assertNotEqual(foundRegex, "", msg)
 
 
 def assertNotGrepFileForRegexStrList(testObject, testName, fileName, regexStrList, verbose):