presubmit_support: cache the result of ChangedContents.

presubmit_support: cache the result of ChangedContents.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=83228

[M-A Ruel, 2011-04-23 01:05:02]

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py
File presubmit_support.py (right):

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py#newcode15
presubmit_support.py:15: import copy
not needed.

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py#newcode487
presubmit_support.py:487: self._cached_new_contents = gclient_utils.FileRead(
It should trap IOError and set to []. The file could be deleted.

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py#newcode489
presubmit_support.py:489: return copy.deepcopy(self._cached_new_contents)
return self._cached_new_contents[:]

[ncarter (slow), 2011-04-26 17:15:19]

Fixed.

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py
File presubmit_support.py (right):

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py#newcode15
presubmit_support.py:15: import copy
On 2011/04/23 01:05:03, Marc-Antoine Ruel wrote:
> not needed.

Done.

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py#newcode487
presubmit_support.py:487: self._cached_new_contents = gclient_utils.FileRead(
On 2011/04/23 01:05:03, Marc-Antoine Ruel wrote:
> It should trap IOError and set to []. The file could be deleted.

Done.  Also, added unittest.

http://codereview.chromium.org/6897005/diff/3/presubmit_support.py#newcode489
presubmit_support.py:489: return copy.deepcopy(self._cached_new_contents)
On 2011/04/23 01:05:03, Marc-Antoine Ruel wrote:
> return self._cached_new_contents[:]

Of course.  Done.

[M-A Ruel, 2011-04-27 14:07:43]

lgtm

http://codereview.chromium.org/6897005/diff/6001/tests/presubmit_unittest.py
File tests/presubmit_unittest.py (right):

http://codereview.chromium.org/6897005/diff/6001/tests/presubmit_unittest.py#...
tests/presubmit_unittest.py:1229: self.failUnless(af.NewContents() == [])
nit: I prefer:
self.assertEquals('', af.ServerPath())
self.assertEquals([], af.NewContents())

[ncarter (slow), 2011-04-27 20:55:13]

http://codereview.chromium.org/6897005/diff/6001/tests/presubmit_unittest.py
File tests/presubmit_unittest.py (right):

http://codereview.chromium.org/6897005/diff/6001/tests/presubmit_unittest.py#...
tests/presubmit_unittest.py:1229: self.failUnless(af.NewContents() == [])
On 2011/04/27 14:07:43, Marc-Antoine Ruel wrote:
> nit: I prefer:
> self.assertEquals('', af.ServerPath())
> self.assertEquals([], af.NewContents())

Done.

[commit-bot: I haz the power, 2011-04-27 21:01:57]

Presubmit check for 6897005-7004 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 tbr.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/depot_tools
.......F..............................
======================================================================
FAIL: testMultiSolutionsJobs (__main__.GClientSmokeBoth)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_smoketest.py", line 974, 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/depot_tools/tests/fake_repos.py", line
672, in checkString
    self.assertEquals(expected, result, msg)
AssertionError: (3,
'/tmp/trialZpxEJR/__main__.GClientSmokeBoth.testMultiSolutionsJobs',
'/tmp/trialZpxEJR/__main__.GClientSmokeBoth.testMultiSolutionsJobs/src/file/other')

----------------------------------------------------------------------
Ran 38 tests in 151.598s

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/depot_tools
...........EE...................
======================================================================
ERROR: testUpdateUnstagedConflict (__main__.GitWrapperTestCase)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/gclient_scm_test.py", line 757, in testUpdateUnstagedConflict
    scm.update(options, (), [])
  File "/mnt/data/b/commit-queue/workdir/depot_tools/gclient_scm.py", line 393,
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 539, in tearDown
    StdoutCheck.tearDown(self)
  File "/mnt/data/b/commit-queue/workdir/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.200s

FAILED (errors=2)


upstream.sh failed
Command /mnt/data/b/commit-queue/workdir/depot_tools/tests/upstream.sh returned
non-zero exit status 1 in /mnt/data/b/commit-queue/workdir/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 321.3s to calculate.

[M-A Ruel, 2011-04-27 21:05:31]

Known issue, just commit manually.