Restore 103787 (fix git progress message), and update test expectations.

Restore 103787 (fix git progress message), and update test expectations.

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

[M-A Ruel, 2011-10-06 00:57:34]

http://codereview.chromium.org/8161009/diff/1/gclient_utils.py
File gclient_utils.py (right):

http://codereview.chromium.org/8161009/diff/1/gclient_utils.py#newcode250
gclient_utils.py:250: def MakeFileAnnotated(fileobj):
Please git svn rebase or svn up correctly.

[M-A Ruel, 2011-10-06 01:40:12]

lgtm

http://codereview.chromium.org/8161009/diff/5/gclient_utils.py
File gclient_utils.py (right):

http://codereview.chromium.org/8161009/diff/5/gclient_utils.py#newcode364
gclient_utils.py:364: filter_fn(in_line)
I still wonder how much it'll break windows, please commit in the morning so I
can see reports during the day if it has weird behavior.

[commit-bot: I haz the power, 2011-10-06 16:31:03]

CQ is trying the patch. Follow status at
https://chromium-status.appspot.com/cq/szager@google.com/8161009/5

[commit-bot: I haz the power, 2011-10-06 16:36:56]

Presubmit check for 8161009-5 failed and returned exit status 1.

Running presubmit commit checks ...
Syncing 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 **
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
.......Warning: testMultiSolutionsJobs is temporarily disabled
..........F.F.F..................
======================================================================
FAIL: TODO(maruel): Remove this line once this test is fixed.
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 920, in testRevertAndStatus
    out = self.parseGclient(['status', '--deps', 'mac'], [])
  File "tests/gclient_smoketest.py", line 77, in parseGclient
    return self.checkBlock(stdout, items)
  File "tests/gclient_smoketest.py", line 138, in checkBlock
    self.assertEquals(len(results), len(items), (stdout, items, len(results)))
AssertionError: ("\n________ running 'git diff --name-status
7748129ccee96c1a8ec6802d85646bd9fa87e43d' in
'/tmp/trialfgVn1U/__main__.GClientSmokeGIT.testRevertAndStatus/src'\n\n________
running 'git diff --name-status e551aef76564d5ff2ab4f22a89f24103e7003380' in
'/tmp/trialfgVn1U/__main__.GClientSmokeGIT.testRevertAndStatus/src/repo2'\n\n________
running 'git diff --name-status 7d70648141cded3611df1e7f985a2ab58d3bc333' in
'/tmp/trialfgVn1U/__main__.GClientSmokeGIT.testRevertAndStatus/src/repo2/repo_renamed'\n",
[], 3)

======================================================================
FAIL: testSync (__main__.GClientSmokeGIT)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 814, in testSync
    ['running', 'running', 'deleting'])
  File "tests/gclient_smoketest.py", line 77, in parseGclient
    return self.checkBlock(stdout, items)
  File "tests/gclient_smoketest.py", line 129, in checkBlock
    self.checkString(results[i][0][0], verb, (i, results[i][0][0], verb))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/fake_repos.py",
line 682, in checkString
    self.assertEquals(expected, result, msg)
AssertionError: (2, 'running', 'deleting')

======================================================================
FAIL: testSyncJobs (__main__.GClientSmokeGIT)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 892, in testSyncJobs
    untangle=True)
  File "tests/gclient_smoketest.py", line 77, in parseGclient
    return self.checkBlock(stdout, items)
  File "tests/gclient_smoketest.py", line 129, in checkBlock
    self.checkString(results[i][0][0], verb, (i, results[i][0][0], verb))
  File "/mnt/data/b/commit-queue/workdir/tools/depot_tools/tests/fake_repos.py",
line 682, in checkString
    self.assertEquals(expected, result, msg)
AssertionError: (2, 'running', 'deleting')

----------------------------------------------------------------------
Ran 40 tests in 165.781s

FAILED (failures=3)


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
........F........................
======================================================================
FAIL: testUpdateCheckout (__main__.ManagedGitWrapperTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_scm_test.py", line 735, in testUpdateCheckout
    self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
AssertionError: ("\n_____ foo at refs/heads/master\n\n________ running 'git
clone --progress -b master --verbose /tmp/tmpFT2Oaq/./.git /tmp/tmpYqdDDC/foo'
in '/tmp/tmpYqdDDC'\nInitialized empty Git repository in
/tmp/tmpYqdDDC/foo/.git/\n", "\n_____ foo at refs/heads/master\n\n________
running 'git clone --progress -b master --verbose /tmp/tmpFT2Oaq/./.git
/tmp/tmpYqdDDC/foo'in '/tmp/tmpYqdDDC'\nInitialized empty Git repository in
/tmp/tmpYqdDDC/foo/.git/\n", "\n_____ foo at refs/heads/master\n\n________
running 'git clone --progress -b master --verbose /tmp/tmpFT2Oaq/./.git
/tmp/tmpYqdDDC/foo' in '/tmp/tmpYqdDDC'\nCloning into
/tmp/tmpYqdDDC/foo...\ndone.\n")

----------------------------------------------------------------------
Ran 33 tests in 1.543s

FAILED (failures=1)


Presubmit checks took 351.1s to calculate.

Was the presubmit check useful? Please send feedback & hate mail to
maruel@chromium.org!

[commit-bot: I haz the power, 2011-10-07 16:08:45]

CQ is trying the patch. Follow status at
https://chromium-status.appspot.com/cq/szager@google.com/8161009/7001

[commit-bot: I haz the power, 2011-10-07 16:14:42]

Presubmit check for 8161009-7001 failed and returned exit status 1.

Running presubmit commit checks ...
Syncing 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 **
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
........F........................
======================================================================
FAIL: testUpdateCheckout (__main__.ManagedGitWrapperTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_scm_test.py", line 735, in testUpdateCheckout
    self.assertTrue(out in (msg1, msg2), (out, msg1, msg2))
AssertionError: ("\n_____ foo at refs/heads/master\n\n________ running 'git
clone --progress -b master --verbose /tmp/tmph3xm5h/./.git /tmp/tmpW_64M6/foo'
in '/tmp/tmpW_64M6'\nInitialized empty Git repository in
/tmp/tmpW_64M6/foo/.git/\n", "\n_____ foo at refs/heads/master\n\n________
running 'git clone --progress -b master --verbose /tmp/tmph3xm5h/./.git
/tmp/tmpW_64M6/foo'in '/tmp/tmpW_64M6'\nInitialized empty Git repository in
/tmp/tmpW_64M6/foo/.git/\n", "\n_____ foo at refs/heads/master\n\n________
running 'git clone --progress -b master --verbose /tmp/tmph3xm5h/./.git
/tmp/tmpW_64M6/foo' in '/tmp/tmpW_64M6'\nCloning into
/tmp/tmpW_64M6/foo...\ndone.\n")

----------------------------------------------------------------------
Ran 33 tests in 1.255s

FAILED (failures=1)


Presubmit checks took 354.8s to calculate.

Was the presubmit check useful? Please send feedback & hate mail to
maruel@chromium.org!

[commit-bot: I haz the power, 2011-10-07 17:05:11]

CQ is trying the patch. Follow status at
https://chromium-status.appspot.com/cq/szager@google.com/8161009/12001

[commit-bot: I haz the power, 2011-10-07 17:12:01]

Change committed as 104504