gclient: fix unittests

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 376 matching lines @@
     solution_name = 'testRunOnDepsNoDeps_solution_name'
     gclient_config = (
       "solutions = [ {\n"
       "  'name': '%s',\n"
       "  'url': '%s',\n"
       "  'custom_deps': {},\n"
       "} ]\n"
     ) % (solution_name, self.url)
 
     entries_content = (
-      'entries = [\n'
-      '  "%s",\n'
-      ']\n'
-    ) % solution_name
+      "entries = \\\n"
+      "{ '%s': '%s'}\n"
+    ) % (solution_name, self.url)
 
     options = self.Options()
 
     checkout_path = os.path.join(self.root_dir, solution_name)
     gclient.os.path.exists(os.path.join(checkout_path, '.git')).AndReturn(False)
     # Expect a check for the entries file and we say there is not one.
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
 
     # An scm will be requested for the solution.
@@ skipping 27 matching lines @@
       "} ]\n"
     ) % (solution_name, self.url)
 
     deps = (
       "use_relative_paths = True\n"
       "deps = {\n"
       "  'src/t': 'svn://scm.t/trunk',\n"
       "}\n")
 
     entries_content = (
-      'entries = [\n'
-      '  "%s",\n'
-      '  "%s",\n'
-      ']\n'
-    ) % (os.path.join(solution_name, 'src', 't'), solution_name)
+      "entries = \\\n"
+      "{ '%s': '%s',\n"
+      "  '%s': 'svn://scm.t/trunk'}\n"
+    ) % (solution_name, self.url, os.path.join(solution_name, 'src', 't'))
 
     scm_wrapper_sol = self.mox.CreateMockAnything()
     scm_wrapper_t = self.mox.CreateMockAnything()
 
     options = self.Options()
 
     gclient.os.path.exists(os.path.join(self.root_dir, solution_name, 'src',
                                         't', '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, solution_name, '.git')
@@ skipping 45 matching lines @@
     ) % (solution_name, self.url)
 
     deps = (
       "deps = {\n"
       "  'src/b': 'svn://original.b/trunk',\n"
       "  'src/t': 'svn://original.t/trunk',\n"
       "}\n"
     )
 
     entries_content = (
-      'entries = [\n'
-      '  "%s",\n'
-      '  "src/n",\n'
-      '  "src/t",\n'
-      ']\n'
-    ) % solution_name
+      "entries = \\\n"
+      "{ 'src/n': 'svn://custom.n/trunk',\n"
+      "  'src/t': 'svn://custom.t/trunk',\n"
+      "  '%s': '%s'}\n"
+    ) % (solution_name, self.url)
 
     scm_wrapper_sol = self.mox.CreateMockAnything()
     scm_wrapper_t = self.mox.CreateMockAnything()
     scm_wrapper_n = self.mox.CreateMockAnything()
 
     options = self.Options()
 
     checkout_path = os.path.join(self.root_dir, solution_name)
     gclient.os.path.exists(os.path.join(checkout_path, '.git')).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, 'src/n', '.git')
@@ skipping 62 matching lines @@
       "  'url': '%s',\n"
       "  'custom_deps': {},\n"
       "}\n]\n") % (name_a, url_a, name_b, url_b)
 
     deps_b = deps_a = (
       "deps = {\n"
       "  'src/t' : 'http://svn.t/trunk',\n"
     "}\n")
 
     entries_content = (
-      'entries = [\n  "%s",\n'
-      '  "%s",\n'
-      '  "src/t",\n'
-      ']\n') % (name_a, name_b)
+      "entries = \\\n"
+      "{ 'src/t': 'http://svn.t/trunk',\n"
+      "  '%s': '%s',\n"
+      "  '%s': '%s'}\n"
+    ) % (name_a, url_a, name_b, url_b)
 
     scm_wrapper_a = self.mox.CreateMockAnything()
     scm_wrapper_b = self.mox.CreateMockAnything()
     scm_wrapper_dep = self.mox.CreateMockAnything()
 
     options = self.Options()
 
     gclient.os.path.exists(os.path.join(self.root_dir, name_a, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, name_b, '.git')
@@ skipping 40 matching lines @@
 
   def testRunOnDepsSuccess(self):
     # Fake .gclient file.
     name = 'testRunOnDepsSuccess_solution_name'
     gclient_config = """solutions = [ {
   'name': '%s',
   'url': '%s',
   'custom_deps': {},
 }, ]""" % (name, self.url)
 
+    entries_content = (
+      "entries = \\\n"
+      "{ '%s': '%s'}\n"
+    ) % (name, self.url)
+
     options = self.Options()
     gclient.os.path.exists(os.path.join(self.root_dir, name, '.git')
         ).AndReturn(False)
     gclient.os.path.exists(os.path.join(self.root_dir, options.entries_filename)
         ).AndReturn(False)
     gclient_scm.CreateSCM(self.url, self.root_dir, name).AndReturn(
         gclient_scm.CreateSCM)
     gclient_scm.CreateSCM.RunCommand('update', options, self.args, [])
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn("Boo = 'a'")
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
-                      'entries = [\n  "%s",\n]\n' % name)
+                      entries_content)
 
     self.mox.ReplayAll()
     client = self._gclient_gclient(self.root_dir, options)
     client.SetConfig(gclient_config)
     client.RunOnDeps('update', self.args)
 
   def testRunOnDepsRevisions(self):
     def OptIsRev(options, rev):
       if not options.revision == str(rev):
         print("options.revision = %s" % options.revision)
@@ skipping 22 matching lines @@
   'src/third_party/cygwin': '/trunk/deps/third_party/cygwin@3248',
 }
 deps_os = {
   'win': {
     'src/foosad/asdf': 'svn://random_server:123/asd/python_24@5580',
   },
   'mac': {
     'src/third_party/python_24': 'svn://random_server:123/trunk/python_24@5580',
   },
 }"""
-    entries_content = (
-      'entries = [\n  "src",\n'
-      '  "foo/third_party/WebKit",\n'
-      '  "src/third_party/cygwin",\n'
-      '  "src/third_party/python_24",\n'
-      '  "src/breakpad/bar",\n'
-      ']\n')
+
     cygwin_path = 'dummy path cygwin'
     webkit_path = 'dummy path webkit'
 
+    entries_content = (
+      "entries = \\\n"
+      "{ 'foo/third_party/WebKit': '%s',\n"
+      "  'src': '%s',\n"
+      "  'src/breakpad/bar':"
+      " 'http://google-breakpad.googlecode.com/svn/trunk/src@285',\n"
+      "  'src/third_party/cygwin': '%s',\n"
+      "  'src/third_party/python_24':"
+      " 'svn://random_server:123/trunk/python_24@5580'}\n"
+    ) % (webkit_path, self.url, cygwin_path)
+
     scm_wrapper_bleh = self.mox.CreateMockAnything()
     scm_wrapper_src = self.mox.CreateMockAnything()
     scm_wrapper_src2 = self.mox.CreateMockAnything()
     scm_wrapper_webkit = self.mox.CreateMockAnything()
     scm_wrapper_breakpad = self.mox.CreateMockAnything()
     scm_wrapper_cygwin = self.mox.CreateMockAnything()
     scm_wrapper_python = self.mox.CreateMockAnything()
     options = self.Options()
     options.revisions = [ 'src@123', 'foo/third_party/WebKit@42',
                           'src/third_party/cygwin@333' ]
@@ skipping 99 matching lines @@
   'custom_deps': {},
   'custom_vars': {},
 }, ]""" % (name, self.url)
     # Fake DEPS file.
     deps_content = """vars = {
   'webkit': '/trunk/bar/',
 }
 deps = {
   'foo/third_party/WebKit': Var('webkit') + 'WebKit',
 }"""
+
+    webkit_path = 'dummy path webkit'
+
     entries_content = (
-      'entries = [\n  "foo/third_party/WebKit",\n'
-      '  "%s",\n'
-      ']\n') % name
-    webkit_path = 'dummy path webkit'
+      "entries = \\\n"
+      "{ 'foo/third_party/WebKit': '%s',\n"
+      "  '%s': '%s'}\n"
+    ) % (webkit_path, name, self.url)
 
     scm_wrapper_webkit = self.mox.CreateMockAnything()
     scm_wrapper_src = self.mox.CreateMockAnything()
 
     options = self.Options()
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn(deps_content)
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
                       entries_content)
 
@@ skipping 30 matching lines @@
   'custom_deps': {},
   'custom_vars': {'webkit': '/trunk/bar_custom/'},
 }, ]""" % (name, self.url)
     # Fake DEPS file.
     deps_content = """vars = {
   'webkit': '/trunk/bar/',
 }
 deps = {
   'foo/third_party/WebKit': Var('webkit') + 'WebKit',
 }"""
+
+    webkit_path = 'dummy path webkit'
+
     entries_content = (
-      'entries = [\n  "foo/third_party/WebKit",\n'
-      '  "%s",\n'
-      ']\n') % name
-    webkit_path = 'dummy path webkit'
+      "entries = \\\n"
+      "{ 'foo/third_party/WebKit': '%s',\n"
+      "  '%s': '%s'}\n"
+    ) % (webkit_path, name, self.url)
 
     scm_wrapper_webkit = self.mox.CreateMockAnything()
     scm_wrapper_src = self.mox.CreateMockAnything()
 
     options = self.Options()
     gclient.FileRead(os.path.join(self.root_dir, name, options.deps_file)
         ).AndReturn(deps_content)
     gclient.FileWrite(os.path.join(self.root_dir, options.entries_filename),
                       entries_content)
 
@@ skipping 202 matching lines @@
 """
     gclient_scm.CaptureSVN = CaptureSVNMock
     info = gclient_scm.CaptureSVNStatus(None)
     self.assertEquals(info, [])
 
 
 if __name__ == '__main__':
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: