When running an svn update, if --force was passed on the...

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
@@ skipping 50 matching lines @@
 
   def setUp(self):
     BaseTestCase.setUp(self)
     self.root_dir = self.Dir()
     self.args = self.Args()
     self.url = self.Url()
     self.relpath = 'asf'
 
   def testDir(self):
     members = [
-        'FullUrlForRelativeUrl', 'RunCommand',
+        'AddAdditionalFlags', 'FullUrlForRelativeUrl', 'RunCommand',
         'cleanup', 'diff', 'export', 'pack', 'relpath', 'revert',
         'revinfo', 'runhooks', 'scm_name', 'status', 'update',
         'updatesingle', 'url',
     ]
 
     # If you add a member, be sure to add the relevant test!
     self.compareMembers(self._scm_wrapper(), members)
 
   def testUnsupportedSCM(self):
     args = [self.url, self.root_dir, self.relpath]
@@ skipping 177 matching lines @@
     # Checkout or update.
     gclient_scm.os.path.exists(base_path).AndReturn(True)
     gclient_scm.scm.SVN.CaptureInfo(
         gclient_scm.os.path.join(base_path, "."), '.'
         ).AndReturn(file_info)
     # Cheat a bit here.
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL'], '.').AndReturn(file_info)
     additional_args = []
     if options.manually_grab_svn_rev:
       additional_args = ['--revision', str(file_info['Revision'])]
+    if options.force:
+      additional_args.append('--force')
     files_list = []
     gclient_scm.scm.SVN.RunAndGetFileList(
         options,
         ['update', base_path] + additional_args,
         self.root_dir, files_list)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.update(options, (), files_list)
@@ skipping 455 matching lines @@
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: