gclient: implement a less hacky relative URL implementation

tests/gclient_test.py

 #!/usr/bin/python
 #
 # Copyright 2008-2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 29 matching lines @@
   def Options(self, *args, **kwargs):
     return self.OptionsObject(self, *args, **kwargs)
 
   def setUp(self):
     BaseTestCase.setUp(self)
     # These are not tested.
     self.mox.StubOutWithMock(gclient.gclient_utils, 'FileRead')
     self.mox.StubOutWithMock(gclient.gclient_utils, 'FileWrite')
     self.mox.StubOutWithMock(gclient.gclient_utils, 'SubprocessCall')
     self.mox.StubOutWithMock(gclient.gclient_utils, 'RemoveDirectory')
+    self.mox.StubOutWithMock(gclient.gclient_utils, 'FullUrlFromRelative')
     # Mock them to be sure nothing bad happens.
     self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'Capture')
     self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'CaptureInfo')
     self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'CaptureStatus')
     self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'Run')
     self.mox.StubOutWithMock(gclient.gclient_scm.scm.SVN, 'RunAndGetFileList')
     self._gclient_gclient = gclient.GClient
     gclient.GClient = self.mox.CreateMockAnything()
     self._scm_wrapper = gclient.gclient_scm.CreateSCM
     gclient.gclient_scm.CreateSCM = self.mox.CreateMockAnything()
@@ skipping 730 matching lines @@
         gclient.os.path.join(self.root_dir, 'src/breakpad/bar', '.git')
         ).AndReturn(False)
     gclient.os.path.exists(
         gclient.os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     gclient.gclient_scm.CreateSCM(self.url, self.root_dir, 'src').AndReturn(
         scm_wrapper_src)
     scm_wrapper_src.RunCommand('update', mox.Func(OptIsRev123), self.args, [])
 
-    gclient.gclient_scm.CreateSCM(self.url, self.root_dir,
-                                  None).AndReturn(scm_wrapper_src2)
-    scm_wrapper_src2.FullUrlForRelativeUrl('/trunk/deps/third_party/cygwin@3248'
-        ).AndReturn(cygwin_path)
+    gclient.gclient_utils.FullUrlFromRelative(self.url,
+                                              '/trunk/deps/third_party/cygwin@3248'

[M-A Ruel, 2009/12/15 18:49:42]

80 cols

+                                              ).AndReturn(cygwin_path)
 
-    gclient.gclient_scm.CreateSCM(self.url, self.root_dir,
-                                  None).AndReturn(scm_wrapper_src2)
-    scm_wrapper_src2.FullUrlForRelativeUrl('/trunk/deps/third_party/WebKit'
-        ).AndReturn(webkit_path)
+    gclient.gclient_utils.FullUrlFromRelative(self.url,
+                                              '/trunk/deps/third_party/WebKit'
+                                              ).AndReturn(webkit_path)
 
     gclient.gclient_scm.CreateSCM(
         webkit_path, self.root_dir, 'foo/third_party/WebKit'
         ).AndReturn(scm_wrapper_webkit)
     scm_wrapper_webkit.RunCommand('update', mox.Func(OptIsRev42), self.args, [])
 
     gclient.gclient_scm.CreateSCM(
         'http://google-breakpad.googlecode.com/svn/trunk/src@285',
         self.root_dir, 'src/breakpad/bar').AndReturn(scm_wrapper_breakpad)
     scm_wrapper_breakpad.RunCommand('update', mox.Func(OptIsRevNone),
@@ skipping 87 matching lines @@
     gclient.os.path.exists(
         gclient.os.path.join(self.root_dir, name, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(
         gclient.os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
     gclient.gclient_scm.CreateSCM(self.url, self.root_dir, name).AndReturn(
         gclient.gclient_scm.CreateSCM)
     gclient.gclient_scm.CreateSCM.RunCommand('update', options, self.args, [])
 
-    gclient.gclient_scm.CreateSCM(self.url, self.root_dir, None
-                                  ).AndReturn(scm_wrapper_src)
-    scm_wrapper_src.FullUrlForRelativeUrl('/trunk/bar/WebKit'
-        ).AndReturn(webkit_path)
+    gclient.gclient_utils.FullUrlFromRelative(self.url,
+                                              '/trunk/bar/WebKit',
+                                              ).AndReturn(webkit_path)
 
     gclient.gclient_scm.CreateSCM(
         webkit_path, self.root_dir, 'foo/third_party/WebKit'
         ).AndReturn(gclient.gclient_scm.CreateSCM)
     gclient.gclient_scm.CreateSCM.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
@@ skipping 40 matching lines @@
     gclient.os.path.exists(
         gclient.os.path.join(self.root_dir, name, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(
         gclient.os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
     gclient.gclient_scm.CreateSCM(self.url, self.root_dir, name).AndReturn(
         gclient.gclient_scm.CreateSCM)
     gclient.gclient_scm.CreateSCM.RunCommand('update', options, self.args, [])
 
-    gclient.gclient_scm.CreateSCM(self.url, self.root_dir,
-                       None).AndReturn(scm_wrapper_src)
-    scm_wrapper_src.FullUrlForRelativeUrl('/trunk/bar_custom/WebKit'
-        ).AndReturn(webkit_path)
+    gclient.gclient_utils.FullUrlFromRelative(self.url,
+                                              '/trunk/bar_custom/WebKit'
+                                              ).AndReturn(webkit_path)
 
     gclient.gclient_scm.CreateSCM(webkit_path, self.root_dir,
         'foo/third_party/WebKit').AndReturn(gclient.gclient_scm.CreateSCM)
     gclient.gclient_scm.CreateSCM.RunCommand('update', options, self.args, [])
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
@@ skipping 70 matching lines @@
     pass
   def test_VarImpl(self):
     pass
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: