Allow properties to be overridden in buildbucket tries.

Allow properties to be overridden in buildbucket tries.

BUG=488235
PRESUBMIT=false
R=nodir@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=295275

[nodir, 2015-05-14 21:32:27]

nodir@chromium.org changed reviewers:
+ nodir@chromium.org

[nodir, 2015-05-14 21:32:27]

https://codereview.chromium.org/1143573002/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/1143573002/diff/1/git_cl.py#newcode270
git_cl.py:270: parameters['properties'].update(override_properties)
will crash if override_properties is None, which is default

[Michael Achenbach, 2015-05-14 21:38:49]

https://codereview.chromium.org/1143573002/diff/1/git_cl.py
File git_cl.py (right):

https://codereview.chromium.org/1143573002/diff/1/git_cl.py#newcode270
git_cl.py:270: parameters['properties'].update(override_properties)
On 2015/05/14 21:32:27, nodir wrote:
> will crash if override_properties is None, which is default

Done. Or would you like the following better?
parameters['properties'].update(override_properties or {})

[nodir, 2015-05-14 21:41:00]

lgtm

[Michael Achenbach, 2015-05-14 21:44:15]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2015-05-14 21:44:27]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1143573002/20001

[commit-bot: I haz the power, 2015-05-14 21:47:34]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-14 21:47:35]

Presubmit check for 1143573002-20001 failed and returned exit status 1.

Running presubmit commit checks ...
Initialized empty Git repository in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/_rietveld/.git/
Updating origin
From https://chromium.googlesource.com/infra/infra
 * [new branch]      deployed   -> origin/deployed
 * [new branch]      master     -> origin/master
From https://chromium.googlesource.com/infra/infra
 * branch            master     -> FETCH_HEAD
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/git_rebase_update_test.py (11.70s) failed
.Switched to branch foobar.
Switched to branch sub_K.
Switched to branch old_branch.
Switched to branch empty_branch.
Switched to branch empty_branch2.
FSwitched to branch foobar.
.
======================================================================
FAIL: testRebaseUpdate (__main__.GitRebaseUpdateTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_rebase_update_test.py", line 207, in testRebaseUpdate
    'branch_L', 'old_branch', 'foobar'})
AssertionError: Items in the first set but not the second:
'origin/master)'

----------------------------------------------------------------------
Ran 3 tests in 11.293s

FAILED (failures=1)
Name                  Stmts   Miss  Cover   Missing
---------------------------------------------------
git_new_branch           28      0   100%   
git_rebase_update       144      0   100%   
git_rename_branch        29      0   100%   
git_reparent_branch      43      0   100%   
---------------------------------------------------
TOTAL                   244      0   100%   


tests/git_common_test.py (6.32s) failed
...x....F.....FF........uCannot foo with a dirty tree. You must commit locally
first.
Uncommitted files: (git diff-index --name-status HEAD)
A	test.file
.......
======================================================================
FAIL: testGetBranchTree (__main__.GitMutableStructuredTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 536, in testGetBranchTree
    self.assertEqual(skipped, {'master', 'root_X', 'branch_DOG', 'root_CAT'})
AssertionError: Items in the first set but not the second:
'78df7e3)'

======================================================================
FAIL: testTooManyBranches (__main__.GitMutableStructuredTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 464, in testTooManyBranches
    self.assertEqual(38, len(self.repo.run(list, self.gc.branches())))
AssertionError: 38 != 39

======================================================================
FAIL: testBranches (__main__.GitReadOnlyFunctionsTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 235, in testBranches
    {'master', 'branch_D', 'root_A'})
AssertionError: Items in the first set but not the second:
'696a838)'

----------------------------------------------------------------------
Ran 32 tests in 6.050s

FAILED (failures=3, expected failures=1, unexpected successes=1)
Name         Stmts   Miss  Cover   Missing
------------------------------------------
git_common     388     19    95%   319, 683-706
FATAL: not at 100% coverage.


Presubmit checks took 181.3s to calculate.

[Michael Achenbach, 2015-05-14 21:49:35]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2015-05-14 21:49:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1143573002/20001

[commit-bot: I haz the power, 2015-05-14 21:52:54]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-14 21:52:55]

Presubmit check for 1143573002-20001 failed and returned exit status 1.

Running presubmit commit checks ...
Initialized empty Git repository in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/_rietveld/.git/
Updating origin
From https://chromium.googlesource.com/infra/infra
 * [new branch]      deployed   -> origin/deployed
 * [new branch]      master     -> origin/master
From https://chromium.googlesource.com/infra/infra
 * branch            master     -> FETCH_HEAD
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/git_rebase_update_test.py (12.33s) failed
.Switched to branch foobar.
Switched to branch sub_K.
Switched to branch old_branch.
Switched to branch empty_branch.
Switched to branch empty_branch2.
FSwitched to branch foobar.
.
======================================================================
FAIL: testRebaseUpdate (__main__.GitRebaseUpdateTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_rebase_update_test.py", line 207, in testRebaseUpdate
    'branch_L', 'old_branch', 'foobar'})
AssertionError: Items in the first set but not the second:
'origin/master)'

----------------------------------------------------------------------
Ran 3 tests in 12.099s

FAILED (failures=1)
Name                  Stmts   Miss  Cover   Missing
---------------------------------------------------
git_new_branch           28      0   100%   
git_rebase_update       144      0   100%   
git_rename_branch        29      0   100%   
git_reparent_branch      43      0   100%   
---------------------------------------------------
TOTAL                   244      0   100%   


tests/git_common_test.py (6.18s) failed
...x....F.....FF........uCannot foo with a dirty tree. You must commit locally
first.
Uncommitted files: (git diff-index --name-status HEAD)
A	test.file
.......
======================================================================
FAIL: testGetBranchTree (__main__.GitMutableStructuredTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 536, in testGetBranchTree
    self.assertEqual(skipped, {'master', 'root_X', 'branch_DOG', 'root_CAT'})
AssertionError: Items in the first set but not the second:
'78df7e3)'

======================================================================
FAIL: testTooManyBranches (__main__.GitMutableStructuredTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 464, in testTooManyBranches
    self.assertEqual(38, len(self.repo.run(list, self.gc.branches())))
AssertionError: 38 != 39

======================================================================
FAIL: testBranches (__main__.GitReadOnlyFunctionsTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 235, in testBranches
    {'master', 'branch_D', 'root_A'})
AssertionError: Items in the first set but not the second:
'696a838)'

----------------------------------------------------------------------
Ran 32 tests in 5.947s

FAILED (failures=3, expected failures=1, unexpected successes=1)
Name         Stmts   Miss  Cover   Missing
------------------------------------------
git_common     388     19    95%   319, 683-706
FATAL: not at 100% coverage.


Presubmit checks took 179.2s to calculate.

[Michael Achenbach, 2015-05-14 22:13:51]

The CQ bit was checked by machenbach@chromium.org

[commit-bot: I haz the power, 2015-05-14 22:14:12]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1143573002/20001

[commit-bot: I haz the power, 2015-05-14 22:17:21]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-05-14 22:17:22]

Presubmit check for 1143573002-20001 failed and returned exit status 1.

Running presubmit commit checks ...
Initialized empty Git repository in
/b/infra_internal/commit_queue/workdir/tools/depot_tools/testing_support/_rietveld/.git/
Updating origin
From https://chromium.googlesource.com/infra/infra
 * [new branch]      deployed   -> origin/deployed
 * [new branch]      master     -> origin/master
From https://chromium.googlesource.com/infra/infra
 * branch            master     -> FETCH_HEAD
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/git_rebase_update_test.py (12.60s) failed
.Switched to branch foobar.
Switched to branch sub_K.
Switched to branch old_branch.
Switched to branch empty_branch.
Switched to branch empty_branch2.
FSwitched to branch foobar.
.
======================================================================
FAIL: testRebaseUpdate (__main__.GitRebaseUpdateTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_rebase_update_test.py", line 207, in testRebaseUpdate
    'branch_L', 'old_branch', 'foobar'})
AssertionError: Items in the first set but not the second:
'origin/master)'

----------------------------------------------------------------------
Ran 3 tests in 12.413s

FAILED (failures=1)
Name                  Stmts   Miss  Cover   Missing
---------------------------------------------------
git_new_branch           28      0   100%   
git_rebase_update       144      0   100%   
git_rename_branch        29      0   100%   
git_reparent_branch      43      0   100%   
---------------------------------------------------
TOTAL                   244      0   100%   


tests/git_common_test.py (6.56s) failed
...x....F.....FF........uCannot foo with a dirty tree. You must commit locally
first.
Uncommitted files: (git diff-index --name-status HEAD)
A	test.file
.......
======================================================================
FAIL: testGetBranchTree (__main__.GitMutableStructuredTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 536, in testGetBranchTree
    self.assertEqual(skipped, {'master', 'root_X', 'branch_DOG', 'root_CAT'})
AssertionError: Items in the first set but not the second:
'78df7e3)'

======================================================================
FAIL: testTooManyBranches (__main__.GitMutableStructuredTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 464, in testTooManyBranches
    self.assertEqual(38, len(self.repo.run(list, self.gc.branches())))
AssertionError: 38 != 39

======================================================================
FAIL: testBranches (__main__.GitReadOnlyFunctionsTest)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "tests/git_common_test.py", line 235, in testBranches
    {'master', 'branch_D', 'root_A'})
AssertionError: Items in the first set but not the second:
'696a838)'

----------------------------------------------------------------------
Ran 32 tests in 6.328s

FAILED (failures=3, expected failures=1, unexpected successes=1)
Name         Stmts   Miss  Cover   Missing
------------------------------------------
git_common     388     19    95%   319, 683-706
FATAL: not at 100% coverage.


Presubmit checks took 183.3s to calculate.

[Michael Achenbach, 2015-05-14 22:28:48]

Hmm - I'm not a depot_tools committer - so I cant land that CL manually - could
you do that maybe?

[Michael Achenbach, 2015-05-15 05:56:17]

Committed patchset #2 (id:20001) manually as 295275.

[tandrii(chromium), 2015-05-15 06:22:21]

tandrii@chromium.org changed reviewers:
+ tandrii@chromium.org

[tandrii(chromium), 2015-05-15 06:22:22]

so I guess you are a committer after all.

[Michael Achenbach, 2015-05-15 07:19:17]

On 2015/05/15 06:22:22, tandrii(chromium) wrote:
> so I guess you are a committer after all.

Yes. My checkout was new and I forgot git auto-svn. Then it uploaded it with a
git repo as base url, which made me think depot_tools is on git (wishful
thinking) - so I tried to use git cl land to commit. Well, never mind...

[Michael Achenbach, 2015-05-15 07:29:58]

On 2015/05/15 07:19:17, Michael Achenbach wrote:
> On 2015/05/15 06:22:22, tandrii(chromium) wrote:
> > so I guess you are a committer after all.
> 
> Yes. My checkout was new and I forgot git auto-svn. Then it uploaded it with a
> git repo as base url, which made me think depot_tools is on git (wishful
> thinking) - so I tried to use git cl land to commit. Well, never mind...

Unrelated to this: Would be nice if presubmit worked ;) so that the commit queue
can be used.