Fix gcl path handling to be more consistent.

tests/gcl_unittest.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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."""
 
 # pylint: disable=E1103,E1101,E1120
 
 import os
@@ skipping 291 matching lines @@
     change_info.description = 'deescription\n\nR=foo@bar.com',
     change_info.files = [('A', 'aa'), ('M', 'bb')]
     change_info.patch = None
     change_info.rietveld = 'my_server'
     files = [item[1] for item in change_info.files]
     output = presubmit_support.PresubmitOutput()
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(output)
     #gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.os.getcwd().AndReturn('somewhere')
     change_info.GetFiles().AndReturn(change_info.files)
-    change_info.GetLocalRoot().AndReturn('proout')
     gcl.os.chdir('proout')
     change_info.GetFileNames().AndReturn(files)
     gcl.GenerateDiff(files)
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
                          '-r', 'georges@example.com',
                          '--message=\'\'', '--issue=1'],
                          change_info.patch).AndReturn(("1",
                                                                     "2"))
+    change_info.GetLocalRoot().AndReturn('proout')
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')
     gcl.sys.stdout.write("*** Upload does not submit a try; use gcl try to"
                          " submit a try. ***")
     gcl.sys.stdout.write("\n")
     gcl.GetRepositoryRoot().AndReturn(self.fake_root_dir)
     gcl.ChangeInfo.Load('naame', self.fake_root_dir, True, True
         ).AndReturn(change_info)
     self.mox.ReplayAll()
@@ skipping 112 matching lines @@
     change_info.files = [('A', 'aa'), ('M', 'bb')]
     change_info.patch = None
     change_info.rietveld = 'my_server'
     change_info.reviewers = ['georges@example.com']
     files = [item[1] for item in change_info.files]
     output = presubmit_support.PresubmitOutput()
     gcl.DoPresubmitChecks(change_info, False, True).AndReturn(output)
     #gcl.GetCodeReviewSetting('CODE_REVIEW_SERVER').AndReturn('my_server')
     gcl.os.getcwd().AndReturn('somewhere')
     change_info.GetFiles().AndReturn(change_info.files)
+    change_info.GetFileNames().AndReturn(files)
     change_info.GetLocalRoot().AndReturn('proout')
     gcl.os.chdir('proout')
-    change_info.GetFileNames().AndReturn(files)
     gcl.GenerateDiff(files)
     gcl.upload.RealMain(['upload.py', '-y', '--server=my_server',
                          '--reviewers=georges@example.com',
                          '--message=\'\'', '--issue=1'],
                          change_info.patch).AndReturn(("1", "2"))
     change_info.Save()
     change_info.PrimeLint()
     gcl.os.chdir('somewhere')
     gcl.sys.stdout.write("*** Upload does not submit a try; use gcl try to"
                          " submit a try. ***")
@@ skipping 56 matching lines @@
     gcl.OptionallyDoPresubmitChecks(change_info, True, []).AndReturn(output)
 
   def mockCommit(self, change_info, commit_message, shell_output):
     gcl.tempfile.mkstemp(text=True).AndReturn((42, 'commit'))
     gcl.os.write(42, commit_message)
     gcl.os.close(42)
     gcl.tempfile.mkstemp(text=True).AndReturn((43, 'files'))
     gcl.os.write(43, '\n'.join(change_info.GetFileNames()))
     gcl.os.close(43)
 
-    gcl.os.getcwd().AndReturn('prev')
-    gcl.os.chdir(change_info.GetLocalRoot())
     gcl.RunShell(['svn', 'commit', '--file=commit', '--targets=files'],
         True).AndReturn(shell_output)
     if 'Committed' in shell_output:
       self.mox.StubOutWithMock(gcl, 'GetCodeReviewSetting')
       gcl.GetCodeReviewSetting('VIEW_VC').AndReturn('http://view/')
 
     gcl.os.remove('commit')
     gcl.os.remove('files')
-    gcl.os.chdir('prev')
 
   def testPresubmitEmpty(self):
     self.mockLoad(files=[])
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
 
     self.assertEquals(retval, 1)
 
   def testPresubmitFails(self):
     change_info = self.mockLoad()
     self.mockPresubmit(change_info, fail=True)
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
 
     self.assertEquals(retval, 1)
 
   def testPresubmitSucceeds(self):
     change_info = self.mockLoad()
     self.mockPresubmit(change_info, fail=False)
     self.mockCommit(change_info, 'deescription\nReview URL: http://my_server/1',
                     '')
-
     self.mox.ReplayAll()
 
     retval = gcl.CMDcommit(['naame'])
 
     self.assertEquals(retval, 0)
     self.assertEquals(change_info.description, 'deescription')
     # pylint: disable=W0212
     self.assertFalse(change_info._deleted)
     self.assertFalse(change_info._closed)
 
@@ skipping 10 matching lines @@
     self.assertEquals(change_info.description,
         'deescription\n\nCommitted: http://view/12345')
     # pylint: disable=W0212
     self.assertTrue(change_info._deleted)
     self.assertTrue(change_info._closed)
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()