Split scm-specific functions out of gclient_scm.py to scm.py.

tests/gclient_scm_test.py

 #!/usr/bin/python
 #
 # Copyright 2008-2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 249 matching lines @@
     file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.git')
     gclient_scm.os.path.exists(file_path).AndReturn(True)
     print("________ found .git directory; skipping %s" % self.relpath)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list = []
     scm.update(options, self.args, file_list)
 
-  def testGetSVNFileInfo(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
-    gclient_scm.CaptureSVN(['info', '--xml', self.url],
-                       '.', True).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 = self._CaptureSVNInfo(self.url, '.', True)
-    self.assertEquals(sorted(file_info.items()), sorted(expected.items()))
-
-  def testCaptureSvnInfo(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)
-    gclient_scm.CaptureSVN(['info', '--xml',
-                            self.url], '.', True).AndReturn(xml_text)
-    self.mox.ReplayAll()
-    file_info = self._CaptureSVNInfo(self.url, '.', True)
-    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': 'dir',
-    }
-    self.assertEqual(file_info, expected)
-
-  def testRevinfo(self):
-    options = self.Options(verbose=False)
-    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)
-    gclient_scm.os.getcwd().AndReturn('bleh')
-    gclient_scm.CaptureSVN(['info', '--xml', self.url], 'bleh'
-                           ).AndReturn(xml_text)
-    self.mox.ReplayAll()
-    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
-                            relpath=self.relpath)
-    rev_info = scm.revinfo(options, self.args, None)
-    self.assertEqual(rev_info, '35')
-
 
 class GitWrapperTestCase(SuperMoxBaseTestBase):
   """This class doesn't use pymox."""
   class OptionsObject(object):
      def __init__(self, test_case, verbose=False, revision=None):
       self.verbose = verbose
       self.revision = revision
       self.manually_grab_svn_rev = True
       self.deps_os = None
       self.force = False
@@ skipping 41 matching lines @@
 M 100644 :4 a
 M 100644 :5 b
 
 reset refs/heads/master
 from :3
 """
   def Options(self, *args, **kwargs):
     return self.OptionsObject(self, *args, **kwargs)
 
   def CreateGitRepo(self, git_import, path):
+    """Do it for real."""
     try:
       Popen(['git', 'init'], stdout=PIPE, stderr=STDOUT,
             cwd=path).communicate()
     except OSError:
       # git is not available, skip this test.
       return False
     Popen(['git', 'fast-import'], stdin=PIPE, stdout=PIPE, stderr=STDOUT,
           cwd=path).communicate(input=git_import)
     Popen(['git', 'checkout'], stdout=PIPE, stderr=STDOUT,
           cwd=path).communicate()
@@ skipping 155 matching lines @@
   def testRevinfo(self):
     if not self.enabled:
       return
     options = self.Options()
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
-class RunSVNTestCase(BaseTestCase):
-  def testRunSVN(self):
-    self.UnMock(gclient_scm, 'RunSVN')
-    param2 = 'bleh'
-    gclient_scm.gclient_utils.SubprocessCall(['svn', 'foo', 'bar'],
-                                             param2).AndReturn(None)
-    self.mox.ReplayAll()
-    gclient_scm.RunSVN(['foo', 'bar'], param2)
-
-
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: