Add --sup_rep support to trychange.py.

tests/gcl_unittest.py

 #!/usr/bin/python
 # Copyright (c) 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 gcl.py."""
 
 # Local imports
 import gcl
 from super_mox import mox, SuperMoxTestBase
 
 
 class GclTestsBase(SuperMoxTestBase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
     SuperMoxTestBase.setUp(self)
     self.fake_root_dir = self.RootDir()
     self.mox.StubOutWithMock(gcl, 'RunShell')
     self.mox.StubOutWithMock(gcl.SVN, 'CaptureInfo')
+    self.mox.StubOutWithMock(gcl.SVN, 'GetCheckoutRoot')
     self.mox.StubOutWithMock(gcl, 'tempfile')
     self.mox.StubOutWithMock(gcl.upload, 'RealMain')
     self.mox.StubOutWithMock(gcl.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gcl.gclient_utils, 'FileWrite')
+    gcl.REPOSITORY_ROOT = None
 
 
 class GclUnittest(GclTestsBase):
   """General gcl.py tests."""
   def testMembersChanged(self):
     self.mox.ReplayAll()
     members = [
         'CODEREVIEW_SETTINGS', 'CODEREVIEW_SETTINGS_FILE', 'Change',
         'ChangeInfo', 'Changes', 'Commit', 'DEFAULT_LINT_IGNORE_REGEX',
         'DEFAULT_LINT_REGEX', 'DeleteEmptyChangeLists', 'DoPresubmitChecks',
@@ skipping 19 matching lines @@
 
   def testGetSVNFileProperty(self):
     # TODO(maruel): TEST ME
     pass
 
   def testUnknownFiles(self):
     # TODO(maruel): TEST ME
     pass
 
   def testGetRepositoryRootNone(self):
-    gcl.REPOSITORY_ROOT = None
-    gcl.os.getcwd().AndReturn("/bleh/prout")
-    result = {
-      "Repository Root": ""
-    }
-    gcl.SVN.CaptureInfo("/bleh/prout", print_error=False).AndReturn(result)
+    gcl.os.getcwd().AndReturn(self.fake_root_dir)
+    gcl.SVN.GetCheckoutRoot(self.fake_root_dir).AndReturn(None)
     self.mox.ReplayAll()
-    self.assertRaises(Exception, gcl.GetRepositoryRoot)
+    self.assertRaises(gcl.gclient_utils.Error, gcl.GetRepositoryRoot)
 
   def testGetRepositoryRootGood(self):
-    gcl.REPOSITORY_ROOT = None
     root_path = gcl.os.path.join('bleh', 'prout', 'pouet')
     gcl.os.getcwd().AndReturn(root_path)
-    result1 = { "Repository Root": "Some root" }
-    gcl.SVN.CaptureInfo(root_path, print_error=False).AndReturn(result1)
-    results2 = { "Repository Root": "A different root" }
-    gcl.SVN.CaptureInfo(gcl.os.path.dirname(root_path),
-                        print_error=False).AndReturn(results2)
+    gcl.SVN.GetCheckoutRoot(root_path).AndReturn(root_path + '.~')

[bradn, 2009/12/22 20:38:47]

Shouldn't this be an os.path.join ?

Why add the .~ ?

     self.mox.ReplayAll()
-    self.assertEquals(gcl.GetRepositoryRoot(), root_path)
+    self.assertEquals(gcl.GetRepositoryRoot(), root_path + '.~')
 
   def testGetCachedFile(self):
     # TODO(maruel): TEST ME
     pass
 
   def testGetCodeReviewSetting(self):
     # TODO(maruel): TEST ME
     pass
 
   def testGetChangelistInfoFile(self):
@@ skipping 258 matching lines @@
     self.mox.ReplayAll()
 
     gcl.UploadCL(change_info, args)
     self.assertEquals(change_info.issue, 1)
     self.assertEquals(change_info.patchset, 2)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()