Chromium Code Reviews
|
|
Chromium Code Reviews
Issue
340953003:
Add --ignore-lock option. (Closed)
|
Created:
6 years, 6 months ago by szager1 Modified:
6 years, 6 months ago CC:
chromium-reviews, Dirk Pranke, cmp-cc_chromium.org, iannucci+depot_tools_chromium.org, ilevy-cc_chromium.org Visibility:
Public. |
DescriptionAdd --ignore-lock option.
Unfortunately, the locking mechanism is still flaky on Windows.
bot_update.py will use this, since we can be certain that there
won't be overlapping access to the cache.
R=hinoka@google.com, agable@chromium.org, hinoka@chromium.org
BUG=
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=278490
Patch Set 1 #
Total comments: 6
Patch Set 2 : #Messages
Total messages: 8 (0 generated)
lgtm % comments. https://codereview.chromium.org/340953003/diff/1/git_cache.py File git_cache.py (right): https://codereview.chromium.org/340953003/diff/1/git_cache.py#newcode131 git_cache.py:131: def __enter__(self): No longer needed? https://codereview.chromium.org/340953003/diff/1/git_cache.py#newcode135 git_cache.py:135: def __exit__(self, *_exc): No longer needed? https://codereview.chromium.org/340953003/diff/1/git_cache.py#newcode507 git_cache.py:507: parser.add_option('--ignore-locks', action='store_true', --ignore_locks (matches no_bootstrap)
https://codereview.chromium.org/340953003/diff/1/git_cache.py File git_cache.py (right): https://codereview.chromium.org/340953003/diff/1/git_cache.py#newcode131 git_cache.py:131: def __enter__(self): On 2014/06/18 23:54:39, Ryan T. wrote: > No longer needed? Done. https://codereview.chromium.org/340953003/diff/1/git_cache.py#newcode135 git_cache.py:135: def __exit__(self, *_exc): On 2014/06/18 23:54:39, Ryan T. wrote: > No longer needed? Done. https://codereview.chromium.org/340953003/diff/1/git_cache.py#newcode507 git_cache.py:507: parser.add_option('--ignore-locks', action='store_true', On 2014/06/18 23:54:39, Ryan T. wrote: > --ignore_locks (matches no_bootstrap) Done.
The CQ bit was checked by szager@chromium.org
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/szager@chromium.org/340953003/20001
The CQ bit was unchecked by commit-bot@chromium.org
Presubmit check for 340953003-20001 failed and returned exit status 1.
Running presubmit commit checks ...
Checking out rietveld...
Running save-description-on-failure.sh
Running push-basic.sh
Running upstream.sh
Running submit-from-new-dir.sh
Running abandon.sh
Running submodule-merge-test.sh
Running upload-local-tracking-branch.sh
Running hooks.sh
Running post-dcommit-hook-test.sh
Running upload-stale.sh
Running patch.sh
Running basic.sh
** Presubmit ERRORS **
tests/scm_unittest.py (43.11s) failed
...svn: Commit failed (details follow):
svn: Conflict at '/origin'
E....EEE.......
======================================================================
ERROR: testGetGetSha1ForSvnRev (__main__.RealGitSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
File "tests/scm_unittest.py", line 148, in setUp
self.enabled = self.FAKE_REPOS.set_up_git() and self.FAKE_REPOS.set_up_svn()
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 353, in set_up_svn
self.populateSvn()
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 504, in populateSvn
self._commit_svn(fs)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 395, in _commit_svn
commit_svn(self.svn_checkout, self.USERS[0][0], self.USERS[0][1])
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 81, in commit_svn
cwd=repo)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
515, in check_output
return check_call_out(args, stdout=PIPE, **kwargs)[0]
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/subprocess2.py", line
478, in check_call_out
returncode, args, kwargs.get('cwd'), out[0], out[1])
CalledProcessError: Command svn commit /tmp/trialvI5V09/repos/svn_checkout -m
foo --non-interactive --no-auth-cache --username user1@example.com --password
foo returned non-zero exit status 1 in /tmp/trialvI5V09/repos/svn_checkout
Adding origin
Adding trunk
Adding trunk/origin
Adding trunk/other
Adding trunk/other/origin
Adding trunk/src
Adding trunk/src/DEPS
Adding trunk/src/DEPS.alt
Adding trunk/src/origin
Adding trunk/src/third_party
Adding trunk/src/third_party/origin
Adding trunk/third_party
Adding trunk/third_party/foo
Adding trunk/third_party/foo/origin
Adding trunk/third_party/origin
Adding trunk/third_party/prout
Adding trunk/third_party/prout/origin
Transmitting file data ..........
======================================================================
ERROR: testCheckout (__main__.RealSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
File "tests/scm_unittest.py", line 406, in setUp
self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 895, in mangle_svn_tree
for k, v in tree.iteritems():
AttributeError: 'NoneType' object has no attribute 'iteritems'
======================================================================
ERROR: testIsValidRevision (__main__.RealSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
File "tests/scm_unittest.py", line 406, in setUp
self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 895, in mangle_svn_tree
for k, v in tree.iteritems():
AttributeError: 'NoneType' object has no attribute 'iteritems'
======================================================================
ERROR: testRevert (__main__.RealSvnTest)
----------------------------------------------------------------------
Traceback (most recent call last):
File "tests/scm_unittest.py", line 406, in setUp
self.tree = self.mangle_svn_tree(('trunk/third_party@-1', ''),)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 895, in mangle_svn_tree
for k, v in tree.iteritems():
AttributeError: 'NoneType' object has no attribute 'iteritems'
----------------------------------------------------------------------
Ran 18 tests in 12.717s
FAILED (errors=4)
Error in atexit._run_exitfuncs:
Traceback (most recent call last):
File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs
func(*targs, **kargs)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 234, in tear_down
self.tear_down_svn()
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 248, in tear_down_svn
wait_for_port_to_free(self.host, self.svn_port)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 161, in wait_for_port_to_free
assert False, '%d is still bound' % port
AssertionError: 10000 is still bound
Error in sys.exitfunc:
Traceback (most recent call last):
File "/usr/lib/python2.7/atexit.py", line 24, in _run_exitfuncs
func(*targs, **kargs)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 234, in tear_down
self.tear_down_svn()
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 248, in tear_down_svn
wait_for_port_to_free(self.host, self.svn_port)
File
"/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/fake_repos.py",
line 161, in wait_for_port_to_free
assert False, '%d is still bound' % port
AssertionError: 10000 is still bound
Presubmit checks took 93.8s to calculate.
Message was sent while issue was closed.
Committed patchset #2 manually as r278490. |
