Fix parallelization of multiple solutions.

Fix parallelization of multiple solutions once for all.

Verify correctness with a unit test written explicitly to verify all corner cases.

BUG=60725
TEST=new unit test

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=99234

[M-A Ruel, 2011-08-30 16:54:13]

Dependent on http://codereview.chromium.org/7773001

[Dirk Pranke, 2011-08-30 21:09:36]

http://codereview.chromium.org/6598087/diff/4001/gclient.py
File gclient.py (right):

http://codereview.chromium.org/6598087/diff/4001/gclient.py#newcode200
gclient.py:200: if self.parent and self.parent.parent:
I'm a little lost here. How do you know that self.parent.parent refers to an
earlier solution?

http://codereview.chromium.org/6598087/diff/4001/gclient.py#newcode209
gclient.py:209: if self.name:
When is self.name null? Should that be legal?

http://codereview.chromium.org/6598087/diff/4001/gclient.py#newcode210
gclient.py:210: def all_objects(root):
what is an object in this case? Is there a better name for this function?

[M-A Ruel, 2011-09-01 16:17:36]

http://codereview.chromium.org/6598087/diff/4001/gclient.py
File gclient.py (right):

http://codereview.chromium.org/6598087/diff/4001/gclient.py#newcode200
gclient.py:200: if self.parent and self.parent.parent:
On 2011/08/30 21:09:36, Dirk Pranke wrote:
> I'm a little lost here. How do you know that self.parent.parent refers to an
> earlier solution?

Redid the doc since the code didn't have to be modified. I also fixed the code
to work with any _recursion_limit value.

http://codereview.chromium.org/6598087/diff/4001/gclient.py#newcode209
gclient.py:209: if self.name:
On 2011/08/30 21:09:36, Dirk Pranke wrote:
> When is self.name null? Should that be legal?

The 'containing' root object has no name.

http://codereview.chromium.org/6598087/diff/4001/gclient.py#newcode210
gclient.py:210: def all_objects(root):
On 2011/08/30 21:09:36, Dirk Pranke wrote:
> what is an object in this case? Is there a better name for this function?

Renamed to yield_full_tree().

[Dirk Pranke, 2011-09-01 18:58:32]

LGTM with nits.

http://codereview.chromium.org/6598087/diff/9001/gclient.py
File gclient.py (right):

http://codereview.chromium.org/6598087/diff/9001/gclient.py#newcode198
gclient.py:198: # For a tree with at least 2 level deep*, the leaf node needs to
dependent
Grammar nits: "For a treee with at least 2 levels, a leaf node needs to depend
on the level higher up in an orderly way."

http://codereview.chromium.org/6598087/diff/9001/gclient.py#newcode204
gclient.py:204: # value.
Nit: "hard coded to 2". Why is there no hope to change it?

[M-A Ruel, 2011-09-01 19:06:21]

Treeee!

http://codereview.chromium.org/6598087/diff/9001/gclient.py
File gclient.py (right):

http://codereview.chromium.org/6598087/diff/9001/gclient.py#newcode204
gclient.py:204: # value.
> 2011/09/01 18:58:32, Dirk Pranke wrote:
> Nit: "hard coded to 2". Why is there no hope to change it?

Because chromium and other projects depends on this. Some dependencies have DEPS
files and shouldn't be processed.

[commit-bot: I haz the power, 2011-09-01 19:07:02]

Can't apply patch for file depot_tools/git_cl/tests/gclient_test.py.
While running patch -p1 --forward --force;
A         depot_tools/git_cl/tests
patching file depot_tools/git_cl/tests/gclient_test.py
Hunk #1 FAILED at 94.
Hunk #2 FAILED at 108.
Hunk #3 FAILED at 115.
Hunk #4 FAILED at 133.
4 out of 4 hunks FAILED -- saving rejects to file
depot_tools/git_cl/tests/gclient_test.py.rej

[M-A Ruel, 2011-09-01 19:14:17]

On 2011/09/01 19:07:02, I haz the power (commit-bot) wrote:
> Can't apply patch for file depot_tools/git_cl/tests/gclient_test.py.
> While running patch -p1 --forward --force;
> A         depot_tools/git_cl/tests
> patching file depot_tools/git_cl/tests/gclient_test.py
> Hunk #1 FAILED at 94.
> Hunk #2 FAILED at 108.
> Hunk #3 FAILED at 115.
> Hunk #4 FAILED at 133.
> 4 out of 4 hunks FAILED -- saving rejects to file
> depot_tools/git_cl/tests/gclient_test.py.rej

Ah! This is a very old issue and the base url is wrong. Hard fixing the base
url.

[commit-bot: I haz the power, 2011-09-01 19:21:56]

Presubmit check for 6598087-14001 failed and returned exit status -2001.
The presubmit check was hung. It took 360.0 seconds to execute and the time
limit is 360.0 seconds.

[commit-bot: I haz the power, 2011-09-01 19:38:57]

Presubmit check for 6598087-14001 failed and returned exit status 1.

Running presubmit commit checks ...
************* Module tests.gclient_test
E1101:131,0:GclientTest._dependencies: Instance of 'GclientTest' has no
'assertGreater' member
Checking out rietveld...
Running push-basic.sh
Running save-description-on-failure.sh
Running basic.sh
Running upload-stale.sh
Running upload-local-tracking-branch.sh
Running patch.sh
Running submit-from-new-dir.sh
Running post-dcommit-hook-test.sh
Running hooks.sh
Running abandon.sh
Running upstream.sh

** Presubmit Messages **
You should install python 2.5 and run ln -s $(which python2.5) python.
A great place to put this symlink is in depot_tools.
Otherwise, you break depot_tools on python 2.5, you get to keep the pieces.

** Presubmit ERRORS **
Fix pylint errors first.

tests/gclient_scm_test.py failed!
Command tests/gclient_scm_test.py returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools
...........EE...................
======================================================================
ERROR: testUpdateUnstagedConflict (__main__.GitWrapperTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_scm_test.py", line 758, in testUpdateUnstagedConflict
    scm.update(options, (), [])
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/gclient_scm.py", line
398, in update
    raise gclient_utils.Error(e.stderr)
Error: error: Your local changes to 'b' would be overwritten by merge. 
Aborting.
Please, commit your changes or stash them before you can merge.


======================================================================
ERROR: testUpdateUnstagedConflict (__main__.GitWrapperTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_scm_test.py", line 540, in tearDown
    StdoutCheck.tearDown(self)
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/super_mox.py",
line 100, in tearDown
    self.assertEquals('', sys.stdout.getvalue())
AssertionError: '' != '\n_____ . at refs/heads/master\n'

----------------------------------------------------------------------
Ran 31 tests in 1.595s

FAILED (errors=2)


tests/gclient_test.py failed!
Command tests/gclient_test.py returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools
EEEE
======================================================================
ERROR: testDependencies (__main__.GclientTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_test.py", line 73, in testDependencies
    self._dependencies('1', False)
  File "tests/gclient_test.py", line 131, in _dependencies
    self.assertGreater(
AttributeError: 'GclientTest' object has no attribute 'assertGreater'

======================================================================
ERROR: testDependenciesJobs (__main__.GclientTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_test.py", line 79, in testDependenciesJobs
    self._dependencies('1000', False)
  File "tests/gclient_test.py", line 131, in _dependencies
    self.assertGreater(
AttributeError: 'GclientTest' object has no attribute 'assertGreater'

======================================================================
ERROR: testDependenciesJobsReverse (__main__.GclientTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_test.py", line 82, in testDependenciesJobsReverse
    self._dependencies('1000', True)
  File "tests/gclient_test.py", line 131, in _dependencies
    self.assertGreater(
AttributeError: 'GclientTest' object has no attribute 'assertGreater'

======================================================================
ERROR: testDependenciesReverse (__main__.GclientTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_test.py", line 76, in testDependenciesReverse
    self._dependencies('1', True)
  File "tests/gclient_test.py", line 131, in _dependencies
    self.assertGreater(
AttributeError: 'GclientTest' object has no attribute 'assertGreater'

----------------------------------------------------------------------
Ran 4 tests in 0.042s

FAILED (errors=4)


upstream.sh failed
Command /mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/upstream.sh
returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests
Setting up test SVN repo...
Setting up test git-svn repo...
error: unknown switch `B'
usage: git checkout [options] <branch>
   or: git checkout [options] [<branch>] -- <file>...

    -q, --quiet           be quiet
    -b <new branch>       branch
    -l                    log for new branch
    -t, --track           track
    -2, --ours            stage
    -3, --theirs          stage
    -f, --force           force
    -m, --merge           merge
    --conflict <style>    conflict style (merge or diff3)
    -p, --patch           select hunks interactively



Presubmit checks took 440.9s to calculate.

[M-A Ruel, 2011-09-01 20:01:23]

On 2011/09/01 19:38:57, I haz the power (commit-bot) wrote:
> ...

assertGreater() is not present on python <2.7. Fixed.

I'll send a separate change for GitWrapperTestCase. It has always been flaky.