Move all mutations into a specific place.

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 194 matching lines @@
 
   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,
         None, '', True)
     self.assertEquals('proto://host/path@revision', d.url)
 
   def testStr(self):
-    # Make sure __str__() works fine.
-    # pylint: disable=W0212
     parser = gclient.Parser()
     options, _ = parser.parse_args([])
     obj = gclient.GClient('foo', options)
-    obj._dependencies.append(
-        gclient.Dependency(obj, 'foo', 'url', None, None, None, None, 'DEPS',
-                           True))
-    obj._dependencies.append(
-        gclient.Dependency(obj, 'bar', 'url', None, None, None, None, 'DEPS',
-                           True))
-    obj.dependencies[0]._dependencies.append(
-        gclient.Dependency(
-          obj.dependencies[0], 'foo/dir1', 'url', None, None, None, None,
-          'DEPS', True))
-    obj.dependencies[0]._dependencies.append(
-        gclient.Dependency(
-          obj.dependencies[0], 'foo/dir2',
-          gclient.GClientKeywords.FromImpl('bar'), None, None, None, None,
-          'DEPS', True))
-    obj.dependencies[0]._dependencies.append(
-        gclient.Dependency(
-          obj.dependencies[0], 'foo/dir3',
-          gclient.GClientKeywords.FileImpl('url'), None, None, None, None,
-          'DEPS', True))
+    obj.add_dependencies_and_close(
+        [
+          gclient.Dependency(
+            obj, 'foo', 'url', None, None, None, None, 'DEPS', True),
+          gclient.Dependency(
+            obj, 'bar', 'url', None, None, None, None, 'DEPS', True),
+        ],
+        [])
+    obj.dependencies[0].add_dependencies_and_close(
+        [
+          gclient.Dependency(
+            obj.dependencies[0], 'foo/dir1', 'url', None, None, None, None,
+            'DEPS', True),
+          gclient.Dependency(
+            obj.dependencies[0], 'foo/dir2',
+            gclient.GClientKeywords.FromImpl('bar'), None, None, None, None,
+            'DEPS', True),
+          gclient.Dependency(
+            obj.dependencies[0], 'foo/dir3',
+            gclient.GClientKeywords.FileImpl('url'), None, None, None, None,
+            'DEPS', True),
+        ],
+        [])
+    # Make sure __str__() works fine.
+    # pylint: disable=W0212
     obj.dependencies[0]._file_list.append('foo')
-    self.assertEquals(434, len(str(obj)), '%d\n%s' % (len(str(obj)), str(obj)))
+    str_obj = str(obj)
+    self.assertEquals(472, len(str_obj), '%d\n%s' % (len(str_obj), str_obj))
 
 
 if __name__ == '__main__':
   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()