svn merge -c -1448745 and -1448285 for reverting HADOOP-9112: test-patch should -1 for @Tests without a timeout

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1460520 13f79535-47bb-0310-9956-ffa450edef68

dev-support/test-patch.sh

@@ -323,7 +323,7 @@ checkAuthor () {
 }
 
 ###############################################################################
-### Check for tests and their timeout in the patch
+### Check for tests in the patch
 checkTests () {
   echo ""
   echo ""
@@ -357,25 +357,7 @@ checkTests () {
   JIRA_COMMENT="$JIRA_COMMENT
 
     {color:green}+1 tests included{color}.  The patch appears to include $testReferences new or modified test files."
-  echo ""
-  echo "======================================================================"
-  echo "======================================================================"
-  echo "    Checking if the tests have timeout assigned in this patch."
-  echo "======================================================================"
-  echo "======================================================================"
-  
-  nontimeoutTests=`cat $PATCH_DIR/patch | $AWK '{ printf "%s ", $0 }'  | $GREP --extended-regex --count '[ ]*\+[ ]*((@Test[\+ ]*[A-Za-z]+)|([\+ ]*@Test[ \+]*\([ \+]*\)[\ ]*\+?[ ]*[A-Za-z]+)|([\+ ]*@Test[\+ ]*\(exception[ \+]*=[ \+]*[A-Z.a-z0-9A-Z ]*\)))'`
-
-  if [[ $nontimeoutTests == 0 ]] ; then
-    JIRA_COMMENT="$JIRA_COMMENT
-
-    {color:green}+1 tests included appear to have a timeout.{color}"
-	return 0
-  fi
-  JIRA_COMMENT="$JIRA_COMMENT
-
-  {color:red}-1 one of tests included doesn't have a timeout.{color}"
-  return 1
+  return 0
 }
 
 cleanUpXml () {

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -162,9 +162,6 @@ Trunk (Unreleased)
 
     HADOOP-9218 Document the Rpc-wrappers used internally (sanjay Radia)
 
-    HADOOP-9112. test-patch should -1 for @Tests without a timeout 
-    (Surenkumar Nihalani via bobby)
-
 
   BUG FIXES