Fix error syncing to LKGR due to misparsing of Cygwin git-svn output.

tests/scm_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 logging
 import os
 import sys
@@ skipping 74 matching lines @@
         'GetDifferentFiles',
         'GetEmail',
         'GetGitSvnHeadRev',
         'GetPatchName',
         'GetSha1ForSvnRev',
         'GetSVNBranch',
         'GetUpstreamBranch',
         'IsGitSvn',
         'IsValidRevision',
         'MatchSvnGlob',
+        'ParseGitSvnSha1',
         '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'], cwd=self.root_dir
                     ).AndReturn('mini@me.com')
     self.mox.ReplayAll()
@@ skipping 55 matching lines @@
     kwargs.setdefault('cwd', self.clone_dir)
     return scm.GIT.Capture(cmd, **kwargs)
 
   def testGetGitSvnHeadRev(self):
     if not self.enabled:
       return
     self.assertEquals(scm.GIT.GetGitSvnHeadRev(cwd=self.clone_dir), 2)
     self._capture(['reset', '--hard', 'HEAD^'])
     self.assertEquals(scm.GIT.GetGitSvnHeadRev(cwd=self.clone_dir), 1)
 
+  def testParseGitSvnSha1(self):
+    test_sha1 = 'a5c63ce8671922e5c59c0dea49ef4f9d4a3020c9'
+    expected_output = test_sha1 + '\n'
+    # Cygwin git-svn 1.7.9 prints extra escape sequences when run under
+    # TERM=xterm
+    cygwin_output = test_sha1 + '\n\033[?1034h'

[Dirk Pranke, 2012/08/09 18:52:23]

Great, this is what I was looking for ...

+
+    self.assertEquals(scm.GIT.ParseGitSvnSha1(expected_output), test_sha1)
+    self.assertEquals(scm.GIT.ParseGitSvnSha1(cygwin_output), test_sha1)
+
   def testGetGetSha1ForSvnRev(self):
     if not self.enabled:
       return
     self.assertEquals(scm.GIT.GetSha1ForSvnRev(cwd=self.clone_dir, rev=1),
                       self.git_hashes[1])
     self.assertEquals(scm.GIT.GetSha1ForSvnRev(cwd=self.clone_dir, rev=2),
                       self.git_hashes[2])
 
 
 class SVNTestCase(BaseSCMTestCase):
@@ skipping 275 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: