Prevent infinite loop on test failure

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1446181 13f79535-47bb-0310-9956-ffa450edef68
Rename

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