Handle conflicting os deps better in gclient.

tests/gclient_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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 gclient.py.
 
 See gclient_smoketest.py for integration tests.
 """
 
@@ skipping 457 matching lines @@
     self.assertEquals(
         [
           'svn://example.com/bar',
           'svn://example.com/bar/unix',
           'svn://example.com/foo',
           'svn://example.com/foo/baz',
           'svn://example.com/foo/unix',
           ],
         sorted(self._get_processed()))
 
+  def testUpdateWithOsDeps(self):
+    """Verifies that complicated deps_os constructs result in the
+    correct data also with multple operating systems. Also see
+    testDepsOsOverrideDepsInDepsFile."""
+
+    test_data = [
+      # Tuples of deps, deps_os, os_list and expected_deps.
+      (
+        # OS doesn't need module.
+        {'foo': 'default_foo'},
+        {'os1': { 'foo': None } },
+        ['os1'],
+        {'foo': None}
+        ),
+      (
+        # OS wants a different version of module.
+        {'foo': 'default_foo'},
+        {'os1': { 'foo': 'os1_foo'} },
+        ['os1'],
+        {'foo': 'os1_foo'}
+        ),
+      (
+        # OS with no overrides at all.
+        {'foo': 'default_foo'},
+        {'os1': { 'foo': None } },
+        ['os2'],
+        {'foo': 'default_foo'}
+        ),
+      (
+        # One OS doesn't need module, one OS wants the default.
+        {'foo': 'default_foo'},
+        {'os1': { 'foo': None },
+         'os2': {}},
+        ['os1', 'os2'],
+        {'foo': 'default_foo'}
+        ),
+      (
+        # One OS doesn't need module, another OS wants a special version.
+        {'foo': 'default_foo'},
+        {'os1': { 'foo': None },
+         'os2': { 'foo': 'os2_foo'}},
+        ['os1', 'os2'],
+        {'foo': 'os2_foo'}
+        ),
+      (
+        # One OS wants to add a module.
+        {'foo': 'default_foo'},
+        {'os1': { 'bar': 'os1_bar' }},
+        ['os1'],
+        {'foo': 'default_foo',
+         'bar': 'os1_bar'}
+        ),
+      (
+        # One OS wants to add a module. One doesn't care.
+        {'foo': 'default_foo'},
+        {'os1': { 'bar': 'os1_bar' }},
+        ['os1', 'os2'],
+        {'foo': 'default_foo',
+         'bar': 'os1_bar'}
+        ),
+      (
+        # Two OSes want to add a module with the same definition.
+        {'foo': 'default_foo'},
+        {'os1': { 'bar': 'os1_bar' }},

[M-A Ruel, 2013/12/13 15:33:36]

I think you meant:
{'os1': { 'bar': 'os1_bar' }, 'os2': { 'bar': 'os1_bar' }},

+        ['os1', 'os2'],
+        {'foo': 'default_foo',
+         'bar': 'os1_bar'}
+        ),
+      ]
+    for deps, deps_os, target_os_list, expected_deps in test_data:
+      gclient.Dependency.UpdateWithOsDeps(deps, deps_os, target_os_list)
+      self.assertEqual(deps, expected_deps)
+
   def testDepsOsOverrideDepsInDepsFile(self):
-    """Verifies that a 'deps_os' path can override a 'deps' path.
+    """Verifies that a 'deps_os' path can override a 'deps' path. Also
+    see testUpdateWithOsDeps above.
     """
 
     write(
         '.gclient',
         'solutions = [\n'
         '  { "name": "foo",\n'
         '    "url": "svn://example.com/foo",\n'
         '  },]\n')
     write(
         os.path.join('foo', 'DEPS'),
         'target_os = ["baz"]\n'
         'deps = {\n'
         '  "foo/src": "/src",\n' # This path is to be overridden by similar path
                                  # in deps_os['unix'].
         '}\n'
         'deps_os = {\n'
         '  "unix": { "foo/unix": "/unix",'
         '            "foo/src": "/src_unix"},\n'
-        '  "baz": { "foo/baz": "/baz", },\n'
+        '  "baz": { "foo/baz": "/baz",\n'
+        '           "foo/src": None},\n'
         '  "jaz": { "foo/jaz": "/jaz", },\n'
         '}')
 
     parser = gclient.OptionParser()
     options, _ = parser.parse_args(['--jobs', '1'])
     options.deps_os = 'unix'
 
     obj = gclient.GClient.LoadCurrentConfig(options)
     obj.RunOnDeps('None', [])
     self.assertEqual(['unix'], sorted(obj.enforced_os))
@@ skipping 61 matching lines @@
   sys.stdout = gclient_utils.MakeFileAutoFlush(sys.stdout)
   sys.stdout = gclient_utils.MakeFileAnnotated(sys.stdout, include_zero=True)
   sys.stderr = gclient_utils.MakeFileAutoFlush(sys.stderr)
   sys.stderr = gclient_utils.MakeFileAnnotated(sys.stderr, include_zero=True)
   logging.basicConfig(
       level=[logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(sys.argv.count('-v'), 3)],
       format='%(relativeCreated)4d %(levelname)5s %(module)13s('
               '%(lineno)d) %(message)s')
   unittest.main()