Enforces using cwd in all svn calls.

tests/scm_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 scm.py."""
 
 from __future__ import with_statement
 import logging
 import os
 import sys
 import unittest
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 from testing_support import fake_repos
 from testing_support.super_mox import SuperMoxTestBase
 
 import scm
 import subprocess2
 
 
+# Access to a protected member XXX of a client class
+# pylint: disable=W0212
+
+
 class BaseTestCase(SuperMoxTestBase):
   # Like unittest's assertRaises, but checks for Gclient.Error.
   def assertRaisesError(self, msg, fn, *args, **kwargs):
     try:
       fn(*args, **kwargs)
     except scm.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
 
@@ skipping 54 matching lines @@
 
 class SVNTestCase(BaseSCMTestCase):
   def setUp(self):
     BaseSCMTestCase.setUp(self)
     self.mox.StubOutWithMock(scm.SVN, 'Capture')
     self.url = self.SvnUrl()
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-        'AssertVersion', 'Capture', 'CaptureRevision', 'CaptureInfo',
+        'AssertVersion', 'Capture', 'CaptureRevision', 'CaptureLocalInfo',
+        'CaptureRemoteInfo',
         'CaptureStatus', 'current_version', 'DiffItem', 'GenerateDiff',
         'GetCheckoutRoot', 'GetEmail', 'GetFileProperty', 'IsMoved',
         'IsMovedInfo', 'ReadSimpleAuth', 'Revert', 'RunAndGetFileList',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm.SVN, members)
 
   def testGetCheckoutRoot(self):
     # pylint: disable=E1103
-    self.mox.StubOutWithMock(scm.SVN, 'CaptureInfo')
+    self.mox.StubOutWithMock(scm.SVN, '_CaptureInfo')
     self.mox.StubOutWithMock(scm, 'GetCasedPath')
     scm.os.path.abspath = lambda x: x
     scm.GetCasedPath = lambda x: x
-    scm.SVN.CaptureInfo(self.root_dir + '/foo/bar').AndReturn({
+    scm.SVN._CaptureInfo([], self.root_dir + '/foo/bar').AndReturn({
         'Repository Root': 'svn://svn.chromium.org/chrome',
         'URL': 'svn://svn.chromium.org/chrome/trunk/src',
     })
-    scm.SVN.CaptureInfo(self.root_dir + '/foo').AndReturn({
+    scm.SVN._CaptureInfo([], self.root_dir + '/foo').AndReturn({
         'Repository Root': 'svn://svn.chromium.org/chrome',
         'URL': 'svn://svn.chromium.org/chrome/trunk',
     })
-    scm.SVN.CaptureInfo(self.root_dir).AndReturn({
+    scm.SVN._CaptureInfo([], self.root_dir).AndReturn({
         'Repository Root': 'svn://svn.chromium.org/chrome',
         'URL': 'svn://svn.chromium.org/chrome/trunk/tools/commit-queue/workdir',
     })
     self.mox.ReplayAll()
     self.assertEquals(scm.SVN.GetCheckoutRoot(self.root_dir + '/foo/bar'),
                       self.root_dir + '/foo')
 
   def testGetFileInfo(self):
     xml_text = r"""<?xml version="1.0"?>
 <info>
 <entry kind="file" path="%s" revision="14628">
 <url>http://src.chromium.org/svn/trunk/src/chrome/app/d</url>
 <repository><root>http://src.chromium.org/svn</root></repository>
 <wc-info>
 <schedule>add</schedule>
 <depth>infinity</depth>
 <copy-from-url>http://src.chromium.org/svn/trunk/src/chrome/app/DEPS</copy-from-url>
 <copy-from-rev>14628</copy-from-rev>
 <checksum>369f59057ba0e6d9017e28f8bdfb1f43</checksum>
 </wc-info>
 </entry>
 </info>
 """ % self.url
-    scm.SVN.Capture(['info', '--xml', self.url]).AndReturn(xml_text)
+    scm.SVN.Capture(['info', '--xml', self.url], None).AndReturn(xml_text)
     expected = {
       'URL': 'http://src.chromium.org/svn/trunk/src/chrome/app/d',
       'UUID': None,
       'Repository Root': 'http://src.chromium.org/svn',
       'Schedule': 'add',
       'Copied From URL':
         'http://src.chromium.org/svn/trunk/src/chrome/app/DEPS',
       'Copied From Rev': '14628',
       'Path': self.url,
       'Revision': 14628,
       'Node Kind': 'file',
     }
     self.mox.ReplayAll()
-    file_info = scm.SVN.CaptureInfo(self.url)
+    file_info = scm.SVN._CaptureInfo([self.url], None)
     self.assertEquals(sorted(file_info.items()), sorted(expected.items()))
 
   def testCaptureInfo(self):
     xml_text = """<?xml version="1.0"?>
 <info>
 <entry
    kind="dir"
    path="."
    revision="35">
 <url>%s</url>
 <repository>
 <root>%s</root>
 <uuid>7b9385f5-0452-0410-af26-ad4892b7a1fb</uuid>
 </repository>
 <wc-info>
 <schedule>normal</schedule>
 <depth>infinity</depth>
 </wc-info>
 <commit
    revision="35">
 <author>maruel</author>
 <date>2008-12-04T20:12:19.685120Z</date>
 </commit>
 </entry>
 </info>
 """ % (self.url, self.root_dir)
-    scm.SVN.Capture(['info', '--xml', self.url]).AndReturn(xml_text)
+    scm.SVN.Capture(['info', '--xml', self.url], None).AndReturn(xml_text)
     self.mox.ReplayAll()
-    file_info = scm.SVN.CaptureInfo(self.url)
+    file_info = scm.SVN._CaptureInfo([self.url], None)
     expected = {
       'URL': self.url,
       'UUID': '7b9385f5-0452-0410-af26-ad4892b7a1fb',
       'Revision': 35,
       'Repository Root': self.root_dir,
       'Schedule': 'normal',
       'Copied From URL': None,
       'Copied From Rev': None,
       'Path': '.',
       'Node Kind': 'directory',
@@ skipping 31 matching lines @@
 <wc-status props="normal" item="conflicted" revision="14725">
 <commit revision="14633">
 <author>nsylvain@chromium.org</author>
 <date>2009-04-27T19:37:17.977400Z</date>
 </commit>
 </wc-status>
 </entry>
 </target>
 </status>
 """
-    scm.SVN.Capture(['status', '--xml', '.']).AndReturn(text)
+    scm.SVN.Capture(['status', '--xml'], '.').AndReturn(text)
 
     self.mox.ReplayAll()
-    info = scm.SVN.CaptureStatus('.')
+    info = scm.SVN.CaptureStatus(None, '.')
     expected = [
       ('?      ', 'unversionned_file.txt'),
       ('M      ', 'build\\internal\\essential.vsprops'),
       ('A  +   ', 'chrome\\app\\d'),
       ('MM     ', 'chrome\\app\\DEPS'),
       ('C      ', 'scripts\\master\\factory\\gclient_factory.py'),
     ]
     self.assertEquals(sorted(info), sorted(expected))
 
   def testCaptureStatusEmpty(self):
     text = r"""<?xml version="1.0"?>
     <status>
     <target
        path="perf">
        </target>
        </status>"""
-    scm.SVN.Capture(['status', '--xml']).AndReturn(text)
+    scm.SVN.Capture(['status', '--xml'], None).AndReturn(text)
     self.mox.ReplayAll()
-    info = scm.SVN.CaptureStatus(None)
+    info = scm.SVN.CaptureStatus(None, None)
     self.assertEquals(info, [])
 
 
 class RealSvnTest(fake_repos.FakeReposTestBase):
   # Tests that work with a checkout.
   def setUp(self):
     super(RealSvnTest, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn()
     if self.enabled:
       self.svn_root = scm.os.path.join(self.root_dir, 'base')
@@ skipping 66 matching lines @@
     # Asserting the tree is not sufficient, svn status must come out clear too.
     self.assertEquals('', self._capture(['status']))
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(level=logging.DEBUG)
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: