Stop modifiying requirements out of thread and generate it instead.

tests/gclient_smoketest.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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 35 matching lines @@
     cmd = cmd_base + cmd
     process = subprocess.Popen(cmd, cwd=cwd, env=self.env,
                                stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                                shell=sys.platform.startswith('win'))
     (stdout, stderr) = process.communicate()
     logging.debug("XXX: %s\n%s\nXXX" % (' '.join(cmd), stdout))
     logging.debug("YYY: %s\n%s\nYYY" % (' '.join(cmd), stderr))
     return (stdout.replace('\r\n', '\n'), stderr.replace('\r\n', '\n'),
             process.returncode)
 
+  def untangle(self, stdout):
+    tasks = {}
+    remaining = []
+    for line in stdout.splitlines(False):
+      m = re.match(r'^(\d)+>(.*)$', line)
+      if not m:
+        remaining.append(line)
+      else:
+        self.assertEquals([], remaining)
+        tasks.setdefault(int(m.group(1)), []).append(m.group(2))
+    out = []
+    for key in sorted(tasks.iterkeys()):
+      out.extend(tasks[key])
+    out.extend(remaining)
+    return '\n'.join(out)
+
   def parseGclient(self, cmd, items, expected_stderr='', untangle=False):
     """Parse gclient's output to make it easier to test.
     If untangle is True, tries to sort out the output from parallel checkout."""
     (stdout, stderr, returncode) = self.gclient(cmd)
     if untangle:
-      tasks = {}
-      remaining = []
-      for line in stdout.splitlines(False):
-        m = re.match(r'^(\d)+>(.*)$', line)
-        if not m:
-          remaining.append(line)
-        else:
-          self.assertEquals([], remaining)
-          tasks.setdefault(int(m.group(1)), []).append(m.group(2))
-      out = []
-      for key in sorted(tasks.iterkeys()):
-        out.extend(tasks[key])
-      out.extend(remaining)
-      stdout = '\n'.join(out)
+      stdout = self.untangle(stdout)
     self.checkString(expected_stderr, stderr)
     self.assertEquals(0, returncode)
     return self.checkBlock(stdout, items)
 
   def splitBlock(self, stdout):
     """Split gclient's output into logical execution blocks.
     ___ running 'foo' at '/bar'
     (...)
     ___ running 'baz' at '/bar'
     (...)
@@ skipping 518 matching lines @@
     self.checkString(join('third_party', 'fpp'), out[0][2])
     self.checkString(join('third_party', 'prout'), out[0][3])
     self.checkString('hi', out[1][1])
     self.assertEquals(4, len(out[0]))
     self.assertEquals(2, len(out[1]))
 
     # So verify it works with --verbose.
     out = self.parseGclient(
         ['status', '--deps', 'mac', '--verbose', '--jobs', '1'],
         [['running', join(self.root_dir, 'src')],
+          ['running', join(self.root_dir, 'src', 'other')],
           ['running', join(self.root_dir, 'src', 'third_party', 'fpp')],
-          ['running', join(self.root_dir, 'src', 'other')],
           ['running', join(self.root_dir, 'src', 'third_party', 'prout')]])
     out = self.svnBlockCleanup(out)
     self.checkString('other', out[0][1])
     self.checkString(join('third_party', 'fpp'), out[0][2])
     self.checkString(join('third_party', 'prout'), out[0][3])
-    self.checkString('hi', out[2][1])
+    self.checkString('hi', out[1][1])
     self.assertEquals(4, len(out[0]))
-    self.assertEquals(1, len(out[1]))
-    self.assertEquals(2, len(out[2]))
+    self.assertEquals(2, len(out[1]))
+    self.assertEquals(1, len(out[2]))
     self.assertEquals(1, len(out[3]))
     self.assertEquals(4, len(out))
 
     # Revert implies --force implies running hooks without looking at pattern
     # matching.
     # TODO(maruel): In general, gclient revert output is wrong. It should output
     # the file list after some ___ running 'svn status'
     results = self.gclient(['revert', '--deps', 'mac', '--jobs', '1'])
     out = self.splitBlock(results[0])
     self.assertEquals(7, len(out))
@@ skipping 407 matching lines @@
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other')))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     tree['src/svn_hooked1'] = 'svn_hooked1'
     self.assertTree(tree)
 
   def testMultiSolutionsJobs(self):
-    print >> sys.stderr, (
-        'Warning: testMultiSolutionsJobs is temporarily disabled')
-    return
-    # unreachable code
-    # pylint: disable=W0101
     if not self.enabled:
       return
     self.gclient(['config', '--spec',
         'solutions=['
         '{"name": "src",'
         ' "url": "' + self.svn_base + 'trunk/src/"},'
         '{"name": "src-git",'
         '"url": "' + self.git_base + 'repo_1"}]'])
-    self.parseGclient(['sync', '--deps', 'mac', '--jobs', '8'],
-        ['running', 'running', 'running',
-         # This is due to the way svn update is called for a single
-         # file when File() is used in a DEPS file.
-         ('running', self.root_dir + '/src/file/other'),
-         'running', 'running', 'running', 'running', 'running', 'running',
-         'running', 'running'],
-        untangle=True)
+    # There is no guarantee that the ordering will be consistent.
+    (stdout, stderr, returncode) = self.gclient(
+        ['sync', '--deps', 'mac', '--jobs', '8'])
+    stdout = self.untangle(stdout)
+    self.checkString('', stderr)
+    self.assertEquals(0, returncode)
+    results = self.splitBlock(stdout)
+    self.assertEquals(12, len(results))

[M-A Ruel, 2011/10/11 02:29:36]

This verifies that all 12 steps went on and the tree is tested right after
anyway.

     tree = self.mangle_git_tree(('repo_1@2', 'src-git'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree.update(self.mangle_svn_tree(
         ('trunk/src@2', 'src'),
         ('trunk/third_party/foo@1', 'src/third_party/foo'),
         ('trunk/other@2', 'src/other')))
     tree['src/file/other/DEPS'] = (
         self.FAKE_REPOS.svn_revs[2]['trunk/other/DEPS'])
     tree['src/git_hooked1'] = 'git_hooked1'
@@ skipping 197 matching lines @@
 
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()