Refactor nag functionality in to NagTimer class.

tests/gclient_scm_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Unit tests for gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 89 matching lines @@
 
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
         'GetRevisionDate',
         'GetUsableRev',
         'RunCommand',
         'cleanup',
         'diff',
+        'nag_max',
+        'nag_timer',
         'pack',
         'relpath',
         'revert',
         'revinfo',
         'runhooks',
         'status',
         'update',
         'updatesingle',
         'url',
     ]
@@ skipping 369 matching lines @@
 
     # Verify no locked files.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([])
 
     # When checking out a single file, we issue an svn checkout and svn update.
     files_list = self.mox.CreateMockAnything()
     gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
         ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
         always=True,
+        nag_max=3,
+        nag_timer=30,
         cwd=self.root_dir)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['update', 'DEPS', '--ignore-externals'],
         cwd=self.base_path,
         file_list=files_list)
 
     # Now we fall back on scm.update().
     gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
     gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
@@ skipping 14 matching lines @@
     # Checks to make sure that we support svn co --depth.
     gclient_scm.scm.SVN.current_version = None
     gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
         ).AndReturn('1.4.4')
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
 
     # When checking out a single file with svn 1.4, we use svn export
     files_list = self.mox.CreateMockAnything()
     gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
         ['svn', 'export', join(self.url, 'DEPS'), join(self.base_path, 'DEPS')],
-        always=True, cwd=self.root_dir)
+        nag_timer=30, nag_max=3, always=True, cwd=self.root_dir)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.updatesingle(options, ['DEPS'], files_list)
 
   def testUpdateSingleCheckoutSVNUpgrade(self):
     options = self.Options(verbose=True)
     file_info = {
       'URL': self.url,
@@ skipping 12 matching lines @@
 
     # Verify no locked files.
     gclient_scm.scm.SVN.CaptureStatus(
         None, join(self.base_path, '.')).AndReturn([])
 
     # When checking out a single file, we issue an svn checkout and svn update.
     files_list = self.mox.CreateMockAnything()
     gclient_scm.gclient_utils.CheckCallAndFilterAndHeader(
         ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
         always=True,
+        nag_max=3,
+        nag_timer=30,
         cwd=self.root_dir)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['update', 'DEPS', '--ignore-externals'],
         cwd=self.base_path,
         file_list=files_list)
 
     # Now we fall back on scm.update().
     gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
     gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
@@ skipping 204 matching lines @@
 class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
         'GetRevisionDate',
         'GetUsableRev',
         'RunCommand',
         'cleanup',
         'diff',
+        'nag_max',
+        'nag_timer',
         'pack',
         'UpdateSubmoduleConfig',
         'relpath',
         'revert',
         'revinfo',
         'runhooks',
         'status',
         'update',
         'url',
     ]
@@ skipping 381 matching lines @@
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: