Fix error printing in gcl.GetRepositoryRoot() and fix its unit tests.

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."""
 
 import StringIO
 import os
 import sys
 import unittest
 
 # Local imports
 import __init__
 import gcl
 mox = __init__.mox
 
 
 class GclTestsBase(unittest.TestCase):
   """Setups and tear downs the mocks but doesn't test anything as-is."""
   def setUp(self):
+    self.mox = mox.Mox()
     def RunShellMock(filename):
       return filename
     self._RunShell = gcl.RunShell
     gcl.RunShell = RunShellMock
+    self._gcl_gclient_CaptureSVNInfo = gcl.gclient.CaptureSVNInfo
+    gcl.gclient.CaptureSVNInfo = self.mox.CreateMockAnything()
+    self._gcl_os_getcwd = gcl.os.getcwd
+    gcl.os.getcwd = self.mox.CreateMockAnything()
 
   def tearDown(self):
     gcl.RunShell = self._RunShell
+    gcl.gclient.CaptureSVNInfo = self._gcl_gclient_CaptureSVNInfo
+    gcl.os.getcwd = self._gcl_os_getcwd
 
   def compareMembers(self, object, members):
     """If you add a member, be sure to add the relevant test!"""
     # Skip over members starting with '_' since they are usually not meant to
     # be for public use.
     actual_members = [x for x in sorted(dir(object))
                       if not x.startswith('_')]
     expected_members = sorted(members)
     if actual_members != expected_members:
       diff = ([i for i in actual_members if i not in expected_members] +
@@ skipping 29 matching lines @@
   def testHelp(self):
     old_stdout = sys.stdout
     try:
       dummy = StringIO.StringIO()
       gcl.sys.stdout = dummy
       gcl.Help()
       self.assertEquals(len(dummy.getvalue()), 1813)
     finally:
       gcl.sys.stdout = old_stdout
 
-  def testGetRepositoryRoot(self):
-    try:
-      def RunShellMock(filename):
-        return '<?xml version="1.0"?>\n<info>'
-      gcl.RunShell = RunShellMock
-      gcl.GetRepositoryRoot()
-    except Exception,e:
-      self.assertEquals(e.args[0], "gcl run outside of repository")
-    pass
+  def testGetRepositoryRootNone(self):
+    gcl.repository_root = None
+    gcl.os.getcwd().AndReturn("/bleh/prout")
+    result = {
+      "Repository Root": ""
+    }
+    gcl.gclient.CaptureSVNInfo("/bleh/prout", print_error=False).AndReturn(result)

[Nicolas Sylvain, 2009/05/20 18:26:57]

80 chars

+    self.mox.ReplayAll()
+    self.assertRaises(Exception, gcl.GetRepositoryRoot)
+    self.mox.VerifyAll()
+
+  def testGetRepositoryRootGood(self):
+    gcl.repository_root = None
+    root_path = os.path.join('bleh', 'prout', 'pouet')
+    gcl.os.getcwd().AndReturn(root_path)
+    result1 = { "Repository Root": "Some root" }
+    gcl.gclient.CaptureSVNInfo(root_path, print_error=False).AndReturn(result1)
+    gcl.os.getcwd().AndReturn(root_path)
+    results2 = { "Repository Root": "A different root" }
+    gcl.gclient.CaptureSVNInfo(
+        os.path.dirname(root_path),
+        print_error=False).AndReturn(results2)
+    self.mox.ReplayAll()
+    self.assertEquals(gcl.GetRepositoryRoot(), root_path)
+    self.mox.VerifyAll()
 
 
 class ChangeInfoUnittest(GclTestsBase):
   def testChangeInfoMembers(self):
     members = [
       'CloseIssue', 'Delete', 'FileList', 'MissingTests', 'Save',
       'UpdateRietveldDescription', 'description', 'files', 'issue', 'name',
       'patch'
     ]
     # If this test fails, you should add the relevant test.
     self.compareMembers(gcl.ChangeInfo(), members)
 
   def testChangeInfoBase(self):
     files = [('M', 'foo'), ('A', 'bar')]
     o = gcl.ChangeInfo('name2', 'issue2', 'description2', files)
     self.assertEquals(o.name, 'name2')
     self.assertEquals(o.issue, 'issue2')
     self.assertEquals(o.description, 'description2')
     self.assertEquals(o.files, files)
     self.assertEquals(o.patch, None)
     self.assertEquals(o.FileList(), ['foo', 'bar'])
 
 
 class UploadCLUnittest(GclTestsBase):
   def setUp(self):
     GclTestsBase.setUp(self)
-    self.mox = mox.Mox()
     self._os_chdir = gcl.os.chdir
     gcl.os.chdir = self.mox.CreateMockAnything()
     self._os_close = gcl.os.close
     gcl.os.close = self.mox.CreateMockAnything()
-    self._os_getcwd = gcl.os.getcwd
-    gcl.os.getcwd = self.mox.CreateMockAnything()
     self._os_remove = gcl.os.remove
     gcl.os.remove = self.mox.CreateMockAnything()
     self._os_write = gcl.os.write
     gcl.os.write = self.mox.CreateMockAnything()
     self._tempfile = gcl.tempfile
     gcl.tempfile = self.mox.CreateMockAnything()
     self._upload_RealMain = gcl.upload.RealMain
     gcl.upload.RealMain = self.mox.CreateMockAnything()
     self._DoPresubmitChecks = gcl.DoPresubmitChecks
     gcl.DoPresubmitChecks = self.mox.CreateMockAnything()
     self._GenerateDiff = gcl.GenerateDiff
     gcl.GenerateDiff = self.mox.CreateMockAnything()
     self._GetCodeReviewSetting = gcl.GetCodeReviewSetting
     gcl.GetCodeReviewSetting = self.mox.CreateMockAnything()
     self._GetRepositoryRoot = gcl.GetRepositoryRoot
     gcl.GetRepositoryRoot = self.mox.CreateMockAnything()
     self._SendToRietveld = gcl.SendToRietveld
     gcl.SendToRietveld = self.mox.CreateMockAnything()
     self._TryChange = gcl.TryChange
     gcl.TryChange = self.mox.CreateMockAnything()
     
   def tearDown(self):
     GclTestsBase.tearDown(self)
     gcl.os.chdir = self._os_chdir
     gcl.os.close = self._os_close
-    gcl.os.getcwd = self._os_getcwd
     gcl.os.remove = self._os_remove
     gcl.os.write = self._os_write
     gcl.tempfile = self._tempfile
     gcl.upload.RealMain = self._upload_RealMain
     gcl.DoPresubmitChecks = self._DoPresubmitChecks
     gcl.GenerateDiff = self._GenerateDiff
     gcl.GetCodeReviewSetting = self._GetCodeReviewSetting
     gcl.GetRepositoryRoot = self._GetRepositoryRoot
     gcl.SendToRietveld = self._SendToRietveld
     gcl.TryChange = self._TryChange
@@ skipping 101 matching lines @@
                   ['--issue', '1', '--patchset', '2'],
                   swallow_exception=True)
     gcl.os.chdir('somewhere')
     self.mox.ReplayAll()
     gcl.UploadCL(change_info, args)
     self.mox.VerifyAll()
 
 
 if __name__ == '__main__':
   unittest.main()