Update upload.py from ed59464f8468.

Update upload.py from ed59464f8468.

R=dpranke@chromium.org
BUG=
TEST=

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

[Dirk Pranke, 2011-08-23 01:43:09]

rubber-stamp LGTM.

[commit-bot: I haz the power, 2011-08-23 13:19:29]

Presubmit check for 7709021-1 failed and returned exit status 1.

Running presubmit commit checks ...

** 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 **
tests/gclient_smoketest.py failed!
Command tests/gclient_smoketest.py returned non-zero exit status 1 in
/mnt/data/b/commit-queue/workdir/tools/depot_tools
.......F................................
======================================================================
FAIL: testMultiSolutionsJobs (__main__.GClientSmokeBoth)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 1046, in testMultiSolutionsJobs
    untangle=True)
  File "tests/gclient_smoketest.py", line 77, in parseGclient
    return self.checkBlock(stdout, items)
  File "tests/gclient_smoketest.py", line 137, in checkBlock
    self.checkString(results[i][0][2], path, (i, results[i][0][2], path))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/fake_repos.py",
line 682, in checkString
    self.assertEquals(expected, result, msg)
AssertionError: (3,
'/tmp/trialWuErkl/__main__.GClientSmokeBoth.testMultiSolutionsJobs',
'/tmp/trialWuErkl/__main__.GClientSmokeBoth.testMultiSolutionsJobs/src/file/other')

----------------------------------------------------------------------
Ran 40 tests in 203.691s

FAILED (failures=1)


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.308s

FAILED (errors=2)


Install google_appengine sdk in
/mnt/data/b/commit-queue/workdir/tools/google_appengine

Presubmit checks took 293.8s to calculate.

[M-A Ruel, 2011-08-23 13:22:15]

On 2011/08/23 13:19:29, I haz the power (commit-bot) wrote:
> Presubmit check for 7709021-1 failed and returned exit status 1.

Just a test. :/