Fix member lookup to be more stable.

tests/gclient_test.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 gclient.py.
 
 See gclient_smoketest.py for integration tests.
 """
 
@@ skipping 185 matching lines @@
     return items
 
   def testAutofix(self):
     # Invalid urls causes pain when specifying requirements. Make sure it's
     # auto-fixed.
     d = gclient.Dependency(
         None, 'name', 'proto://host/path/@revision', None, None,
         None, '', True)
     self.assertEquals('proto://host/path@revision', d.url)
 
+  def testStr(self):
+    parser = gclient.Parser()
+    options, args = parser.parse_args([])
+    write(
+        '.gclient',
+        'solutions = [\n'
+        '  { "name": "foo", "url": "svn://example.com/foo" },\n'
+        '  { "name": "bar", "url": "svn://example.com/bar" },\n'
+        '  { "name": "bar/empty", "url": "svn://example.com/bar_empty" },\n'
+        ']')
+    write(
+        os.path.join('foo', 'DEPS'),
+        'deps = {\n'
+        '  "foo/dir1": "/dir1",\n'
+        # This one will depend on dir1/dir2 in bar.
+        '  "foo/dir1/dir2/dir3": "/dir1/dir2/dir3",\n'
+        '  "foo/dir1/dir2/dir3/dir4": "/dir1/dir2/dir3/dir4",\n'
+        '  "foo/dir1/dir2/dir5/dir6":\n'
+        '    From("foo/dir1/dir2/dir3/dir4", "foo/dir1/dir2"),\n'
+        '}')
+    write(
+        os.path.join('bar', 'DEPS'),
+        'deps = {\n'
+        '  "foo/dir1/dir2": "/dir1/dir2",\n'
+        '}')
+    write(
+        os.path.join('bar/empty', 'DEPS'),
+        'deps = {\n'
+        '}')
+    # Test From()
+    write(
+        os.path.join('foo/dir1/dir2/dir3/dir4', 'DEPS'),
+        'deps = {\n'
+        # This one should not be fetched or set as a requirement.
+        '  "foo/dir1/dir2/dir5": "svn://example.com/x",\n'
+        '  "foo/dir1/dir2": "/dir1/another",\n'
+        '}')
+
+    obj = gclient.GClient.LoadCurrentConfig(options)
+    obj.RunOnDeps('None', args)
+    self.assertEquals(
+        [ 'svn://example.com/foo', 'svn://example.com/bar',
+          'svn://example.com/bar_empty', 'svn://example.com/foo/dir1',
+          'svn://example.com/bar/dir1/dir2',
+          'svn://example.com/foo/dir1/dir2/dir3',
+          'svn://example.com/foo/dir1/dir2/dir3/dir4',
+          'svn://example.com/foo/dir1/dir2/dir3/dir4/dir1/another'],
+        self._get_processed())
+    # Inject file_list manually.
+    obj.dependencies[0]._file_list.append('foo')  # pylint: disable=W0212
+    self.assertEquals(1874, len(str(obj)), '%d\n%s' % (len(str(obj)), str(obj)))

[M-A Ruel, 2011/09/14 22:56:55]

The whole code above is to test this line.

+
+
 if __name__ == '__main__':
   logging.basicConfig(
       level=[logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(sys.argv.count('-v'), 3)],
       format='%(asctime).19s %(levelname)s %(filename)s:'
               '%(lineno)s %(message)s')
   unittest.main()