Change scm.SVN.Capture

tests/scm_unittest.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 scm.py."""
 
 from shutil import rmtree
 import tempfile
 
@@ skipping 10 matching lines @@
       fn(*args, **kwargs)
     except scm.gclient_utils.Error, e:
       self.assertEquals(e.args[0], msg)
     else:
       self.fail('%s not raised' % msg)
 
 
 class BaseSCMTestCase(BaseTestCase):
   def setUp(self):
     BaseTestCase.setUp(self)
-    self.mox.StubOutWithMock(scm.gclient_utils, 'Popen')
+    self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCall')
     self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilter')
     self.mox.StubOutWithMock(scm.gclient_utils, 'CheckCallAndFilterAndHeader')
+    self.mox.StubOutWithMock(scm.gclient_utils, 'Popen')
 
 
 class RootTestCase(BaseSCMTestCase):
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'GetCasedPath', 'GenFakeDiff', 'GIT', 'SVN', 'ValidateEmail',
         'cStringIO', 'gclient_utils', 'glob', 'os', 're', 'shutil',
         'subprocess', 'sys', 'tempfile', 'time', 'xml',
     ]
@@ skipping 102 matching lines @@
     self.assertEqual(scm.GIT.GetEmail(self.fake_root), 'mini@me.com')
 
 
 class SVNTestCase(BaseSCMTestCase):
   def setUp(self):
     BaseSCMTestCase.setUp(self)
     self.root_dir = self.Dir()
     self.args = self.Args()
     self.url = self.Url()
     self.relpath = 'asf'
+    self.mox.StubOutWithMock(scm.SVN, 'Capture')
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-        'AssertVersion', 'Capture', 'CaptureBaseRevision',
-        'CaptureHeadRevision', 'CaptureInfo', 'CaptureStatus',
-        'current_version', 'DiffItem', 'GenerateDiff',
+        'AssertVersion', 'Capture', 'CaptureRevision', 'CaptureInfo',
+        'CaptureStatus', 'current_version', 'DiffItem', 'GenerateDiff',
         'GetCheckoutRoot', 'GetEmail', 'GetFileProperty', 'IsMoved',
         'IsMovedInfo', 'ReadSimpleAuth', 'RunAndGetFileList',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm.SVN, members)
 
   def testGetCheckoutRoot(self):
     self.mox.StubOutWithMock(scm.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(scm, 'GetCasedPath')
     scm.os.path.abspath(self.root_dir + 'x').AndReturn(self.root_dir)
     scm.GetCasedPath(self.root_dir).AndReturn(self.root_dir)
     result1 = { "Repository Root": "Some root" }
-    scm.SVN.CaptureInfo(self.root_dir, print_error=False).AndReturn(result1)
+    scm.SVN.CaptureInfo(self.root_dir).AndReturn(result1)
     results2 = { "Repository Root": "A different root" }
-    scm.SVN.CaptureInfo(scm.os.path.dirname(self.root_dir),
-                        print_error=False).AndReturn(results2)
+    scm.SVN.CaptureInfo(
+        scm.os.path.dirname(self.root_dir)).AndReturn(results2)
     self.mox.ReplayAll()
     self.assertEquals(scm.SVN.GetCheckoutRoot(self.root_dir + 'x'),
                       self.root_dir)
 
   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
-    self.mox.StubOutWithMock(scm.SVN, 'Capture')
-    scm.SVN.Capture(['info', '--xml', self.url], '.', True).AndReturn(xml_text)
+    scm.SVN.Capture(['info', '--xml', self.url]).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, '.', True)
+    file_info = scm.SVN.CaptureInfo(self.url)
     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)
-    self.mox.StubOutWithMock(scm.SVN, 'Capture')
-    scm.SVN.Capture(['info', '--xml', self.url], '.', True).AndReturn(xml_text)
+    scm.SVN.Capture(['info', '--xml', self.url]).AndReturn(xml_text)
     self.mox.ReplayAll()
-    file_info = scm.SVN.CaptureInfo(self.url, '.', True)
+    file_info = scm.SVN.CaptureInfo(self.url)
     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>
 """
-    proc = self.mox.CreateMockAnything()
-    scm.gclient_utils.Popen(['svn', 'status', '--xml', '.'],
-                            cwd=None,
-                            stderr=None,
-                            stdout=scm.subprocess.PIPE).AndReturn(proc)
-    proc.communicate().AndReturn((text, 0))
+    scm.SVN.Capture(['status', '--xml', '.']).AndReturn(text)
 
     self.mox.ReplayAll()
     info = scm.SVN.CaptureStatus('.')
     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>"""
-    proc = self.mox.CreateMockAnything()
-    scm.gclient_utils.Popen(['svn', 'status', '--xml'],
-                            cwd=None,
-                            stderr=None,
-                            stdout=scm.subprocess.PIPE).AndReturn(proc)
-    proc.communicate().AndReturn((text, 0))
+    scm.SVN.Capture(['status', '--xml']).AndReturn(text)
     self.mox.ReplayAll()
     info = scm.SVN.CaptureStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: