Move GenerateDiff into a common function.

tests/scm_unittest.py

 #!/usr/bin/python
 # 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.
 
 """Unit tests for scm.py."""
 
 import shutil
 import tempfile
 
 from gclient_test import BaseTestCase
 import scm
 from super_mox import mox, SuperMoxBaseTestBase
 
 
 class BaseSCMTestCase(BaseTestCase):
   def setUp(self):
     BaseTestCase.setUp(self)
     self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCall')
     self.mox.StubOutWithMock(scm.gclient_utils, 'SubprocessCallAndFilter')
 
 
 class RootTestCase(BaseSCMTestCase):
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'GIT', 'SVN',
-        'gclient_utils', 'os', 're', 'subprocess', 'sys', 'tempfile', 'xml',
+        'gclient_utils', 'os', 're', 'shutil', 'subprocess', 'sys', 'tempfile',
+        'xml',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm, members)
 
 
 class GitWrapperTestCase(SuperMoxBaseTestBase):
   sample_git_import = """blob
 mark :1
 data 6
 Hello
@@ skipping 69 matching lines @@
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
     self.fake_root = self.Dir()
 
   def tearDown(self):
     shutil.rmtree(self.root_dir)
     SuperMoxBaseTestBase.tearDown(self)
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
-        'COMMAND', 'Capture', 'CaptureStatus', 'GetEmail',
+        'COMMAND', 'Capture', 'CaptureStatus', 'FetchUpstreamTuple',
+        'GenerateDiff', 'GetBranchRef', 'GetEmail', 'GetSVNBranch',
+        'GetUpstream', 'IsGitSvn', 'ShortBranchName'
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm.GIT, members)
 
   def testGetEmail(self):
     self.mox.StubOutWithMock(scm.GIT, 'Capture')
-    scm.GIT.Capture(['config', 'user.email'], self.fake_root).AndReturn('mini@me.com')
+    scm.GIT.Capture(['config', 'user.email'], self.fake_root, error_ok=True
+                    ).AndReturn('mini@me.com')
     self.mox.ReplayAll()
     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'
 
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'COMMAND', 'Capture', 'CaptureHeadRevision', 'CaptureInfo',
-        'CaptureStatus', 'DiffItem', 'GetCheckoutRoot', 'GetEmail',
-        'GetFileProperty', 'IsMoved',
+        'CaptureStatus', 'DiffItem', 'GenerateDiff', 'GetCheckoutRoot',
+        'GetEmail', 'GetFileProperty', 'IsMoved',
         'ReadSimpleAuth', 'Run', 'RunAndFilterOutput', 'RunAndGetFileList',
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(scm.SVN, members)
 
   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>
@@ skipping 148 matching lines @@
     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: