gclient: implement a less hacky relative URL implementation

tests/gclient_test.py

Index: tests/gclient_test.py
diff --git a/tests/gclient_test.py b/tests/gclient_test.py
index e21c20ae7dceef52a27e55f185d426d8a7347954..aaa007c3e41af197370d7c27344d5f55f6930b21 100755
--- a/tests/gclient_test.py
+++ b/tests/gclient_test.py
@@ -47,6 +47,7 @@ class GClientBaseTestCase(BaseTestCase):
     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')
@@ -797,15 +798,13 @@ deps_os = {
         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'
@@ -913,10 +912,9 @@ deps = {
         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'
@@ -977,10 +975,9 @@ deps = {
         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)