Stop SVNWrapper and GitWrapper from inheriting from scm.SVN and scm.GIT.

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 40 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 = [
-        'COMMAND', 'Capture', 'CaptureHeadRevision', 'CaptureInfo',
-        'CaptureStatus', 'DiffItem', 'GenerateDiff', 'GetCheckoutRoot',
-        'GetEmail', 'GetFileProperty', 'FullUrlForRelativeUrl', 'IsMoved',
-        'ReadSimpleAuth', 'Run', 'RunAndFilterOutput', 'RunAndGetFileList',
-        'RunCommand', 'cleanup', 'diff', 'export', 'pack', 'relpath', 'revert',
+        'FullUrlForRelativeUrl', 'RunCommand',
+        'cleanup', 'diff', 'export', 'pack', 'relpath', 'revert',
         'revinfo', 'runhooks', 'scm_name', 'status', 'update', '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]
     kwargs = {'scm_name' : 'foo'}
     exception_msg = 'Unsupported scm %(scm_name)s' % kwargs
@@ skipping 296 matching lines @@
     self.base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     self.enabled = self.CreateGitRepo(self.sample_git_import, self.base_path)
     SuperMoxBaseTestBase.setUp(self)
 
   def tearDown(self):
     SuperMoxBaseTestBase.tearDown(self)
     rmtree(self.root_dir)
 
   def testDir(self):
     members = [
-        'COMMAND', 'AssertVersion', 'Capture', 'CaptureStatus',
-        'FetchUpstreamTuple',
-        'FullUrlForRelativeUrl', 'GenerateDiff', 'GetBranch', 'GetBranchRef',
-        'GetCheckoutRoot', 'GetDifferentFiles', 'GetEmail', 'GetPatchName',
-        'GetSVNBranch', 'GetUpstream', 'IsGitSvn', 'RunAndFilterOutput',
-        'ShortBranchName', 'RunCommand',
+        'FullUrlForRelativeUrl', 'RunCommand',
         'cleanup', 'diff', 'export', 'pack', 'relpath', 'revert',
         'revinfo', 'runhooks', 'scm_name', 'status', 'update', 'url',
     ]
 
     # If you add a member, be sure to add the relevant test!
     self.compareMembers(gclient_scm.CreateSCM(url=self.url), members)
 
   def testRevertMissing(self):
     if not self.enabled:
       return
@@ skipping 190 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: