Fix scm.SVN.GetCheckoutRoot() so it is not confused by intermixed checkouts

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."""
 
 # pylint: disable=E1101,W0403
 
 # Fixes include path.
@@ skipping 67 matching lines @@
         'CaptureStatus', 'current_version', 'DiffItem', 'GenerateDiff',
         'GetCheckoutRoot', 'GetEmail', 'GetFileProperty', 'IsMoved',
         'IsMovedInfo', 'ReadSimpleAuth', 'Revert', '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).AndReturn(result1)
-    results2 = { "Repository Root": "A different root" }
-    scm.SVN.CaptureInfo(
-        scm.os.path.dirname(self.root_dir)).AndReturn(results2)
+    scm.os.path.abspath = lambda x: x
+    scm.GetCasedPath = lambda x: x
+    scm.SVN.CaptureInfo(self.root_dir + '/foo/bar').AndReturn({
+        'Repository Root': 'svn://svn.chromium.org/chrome',
+        'URL': 'svn://svn.chromium.org/chrome/trunk/src',
+    })
+    scm.SVN.CaptureInfo(self.root_dir + '/foo').AndReturn({
+        'Repository Root': 'svn://svn.chromium.org/chrome',
+        'URL': 'svn://svn.chromium.org/chrome/trunk',
+    })
+    scm.SVN.CaptureInfo(self.root_dir).AndReturn({
+        'Repository Root': 'svn://svn.chromium.org/chrome',
+        'URL': 'svn://svn.chromium.org/chrome/trunk/tools/commit-queue/workdir',
+    })
     self.mox.ReplayAll()
-    self.assertEquals(scm.SVN.GetCheckoutRoot(self.root_dir + 'x'),
-                      self.root_dir)
+    self.assertEquals(scm.SVN.GetCheckoutRoot(self.root_dir + '/foo/bar'),
+                      self.root_dir + '/foo')
 
   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>
@@ skipping 123 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: