Standardize automatic retry and add a 15 seconds sleep to increase the chances of success

scm.py

 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """SCM-specific utility classes."""
 
 import glob
 import os
 import re
 import shutil
 import subprocess
 import sys
 import tempfile
+import time
 import xml.dom.minidom
 
 import gclient_utils
 
 def ValidateEmail(email):
  return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
          is not None)
 
 
 def GetCasedPath(path):
@@ skipping 350 matching lines @@
     # else, which is good.  Note that the patterns are only effective when
     # these commands are used in their ordinary forms, the patterns are invalid
     # for "svn status --show-updates", for example.
     pattern = {
           'checkout': update_pattern,
           'status':   status_pattern,
           'update':   update_pattern,
         }[args[0]]
     compiled_pattern = re.compile(pattern)
     # Place an upper limit.
-    for _ in range(1, 10):
+    for _ in range(10):
       previous_list_len = len(file_list)
       failure = []
 
       def CaptureMatchingLines(line):
         match = compiled_pattern.search(line)
         if match:
           file_list.append(match.group(1))
         if line.startswith('svn: '):
           failure.append(line)
 
       try:
         SVN.RunAndFilterOutput(args,
                                in_directory,
                                options.verbose,
                                True,
                                CaptureMatchingLines)
       except gclient_utils.Error:
         # We enforce that some progress has been made or HTTP 502.
         if (filter(lambda x: '502 Bad Gateway' in x, failure) or
             (len(failure) and len(file_list) > previous_list_len)):
           if args[0] == 'checkout':
             # An aborted checkout is now an update.
             args = ['update'] + args[1:]
+          print "Sleeping 15 seconds and retrying...."
+          time.sleep(15)
           continue
         # No progress was made or an unknown error we aren't sure, bail out.
         raise
       break
 
   @staticmethod
   def RunAndFilterOutput(args,
                          in_directory,
                          print_messages,
                          print_stdout,
@@ skipping 360 matching lines @@
     if not SVN.current_version:
       SVN.current_version = SVN.Capture(['--version']).split()[2]
     current_version_list = map(only_int, SVN.current_version.split('.'))
     for min_ver in map(int, min_version.split('.')):
       ver = current_version_list.pop(0)
       if ver < min_ver:
         return (False, SVN.current_version)
       elif ver > min_ver:
         return (True, SVN.current_version)
     return (True, SVN.current_version)