aiden
/
depot_tools
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git cl refactor: s/should_git_number/should_add_git_number

Browse Source 
R=sergiyb@google.com
BUG=chromium:642493

Change-Id: Id7b732d82c25ce88a3295ff54c79cf2a66e0d5b9
Reviewed-on: https://chromium-review.googlesource.com/419437
Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
changes/37/419437/2
Andrii Shyshkalov 8 years ago committed by Commit Bot
parent a5a1eea537
commit 8f15f3ec1d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
git_cl.py
Unescape Escape View File

@ -1160,7 +1160,7 @@ class _GitNumbererState(object):
return self._pending_prefix return self._pending_prefix
@property @property
def should_git_number(self): def should_add_git_number(self):
return self._validator_enabled and self._pending_prefix is None return self._validator_enabled and self._pending_prefix is None
@ -4658,7 +4658,7 @@ def SendUpstream(parser, args, cmd):
pending_prefix = git_numberer.pending_prefix pending_prefix = git_numberer.pending_prefix
if git_numberer.should_git_number: if git_numberer.should_add_git_number:
# TODO(tandrii): run git fetch in a loop + autorebase when there there # TODO(tandrii): run git fetch in a loop + autorebase when there there
# is no pending ref to push to? # is no pending ref to push to?
logging.debug('Adding git number footers') logging.debug('Adding git number footers')

14
tests/git_cl_test.py
Unescape Escape View File

@ -1169,7 +1169,7 @@ class TestGitCl(TestCase):
remote_url='https://chromium.googlesource.com/chromium/tools/build', remote_url='https://chromium.googlesource.com/chromium/tools/build',
remote_ref='refs/whatever') remote_ref='refs/whatever')
self.assertEqual(res.pending_prefix, None) self.assertEqual(res.pending_prefix, None)
self.assertEqual(res.should_git_number, False) self.assertEqual(res.should_add_git_number, False)
def test_GitNumbererState_fail_fetch(self): def test_GitNumbererState_fail_fetch(self):
self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
@ -1185,7 +1185,7 @@ class TestGitCl(TestCase):
remote_url='https://chromium.googlesource.com/chromium/src', remote_url='https://chromium.googlesource.com/chromium/src',
remote_ref='refs/whatever') remote_ref='refs/whatever')
self.assertEqual(res.pending_prefix, 'refs/pending-prefix/') self.assertEqual(res.pending_prefix, 'refs/pending-prefix/')
self.assertEqual(res.should_git_number, False) self.assertEqual(res.should_add_git_number, False)
def test_GitNumbererState_fail_gnumbd_and_validator(self): def test_GitNumbererState_fail_gnumbd_and_validator(self):
self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) self.mock(git_cl.sys, 'stdout', StringIO.StringIO())
@ -1203,7 +1203,7 @@ class TestGitCl(TestCase):
remote_url='https://chromium.googlesource.com/chromium/src', remote_url='https://chromium.googlesource.com/chromium/src',
remote_ref='refs/whatever') remote_ref='refs/whatever')
self.assertEqual(res.pending_prefix, None) self.assertEqual(res.pending_prefix, None)
self.assertEqual(res.should_git_number, False) self.assertEqual(res.should_add_git_number, False)
def test_GitNumbererState_valid_configs(self): def test_GitNumbererState_valid_configs(self):
class NamedTempFileStab(StringIO.StringIO): class NamedTempFileStab(StringIO.StringIO):
@ -1248,19 +1248,19 @@ class TestGitCl(TestCase):
remote_url='https://chromium.googlesource.com/chromium/src', remote_url='https://chromium.googlesource.com/chromium/src',
remote_ref='refs/heads/master') remote_ref='refs/heads/master')
self.assertEqual(res.pending_prefix, 'refs/pending/') self.assertEqual(res.pending_prefix, 'refs/pending/')
self.assertEqual(res.should_git_number, False) self.assertEqual(res.should_add_git_number, False)
res = git_cl._GitNumbererState.load( res = git_cl._GitNumbererState.load(
remote_url='https://chromium.googlesource.com/chromium/src', remote_url='https://chromium.googlesource.com/chromium/src',
remote_ref='refs/heads/test') remote_ref='refs/heads/test')
self.assertEqual(res.pending_prefix, None) self.assertEqual(res.pending_prefix, None)
self.assertEqual(res.should_git_number, True) self.assertEqual(res.should_add_git_number, True)
res = git_cl._GitNumbererState.load( res = git_cl._GitNumbererState.load(
remote_url='https://chromium.googlesource.com/chromium/src', remote_url='https://chromium.googlesource.com/chromium/src',
remote_ref='refs/heads/disabled') remote_ref='refs/heads/disabled')
self.assertEqual(res.pending_prefix, None) self.assertEqual(res.pending_prefix, None)
self.assertEqual(res.should_git_number, False) self.assertEqual(res.should_add_git_number, False)
# Validator is disabled by default, even if it's not explicitely in disabled # Validator is disabled by default, even if it's not explicitely in disabled
# refglobs. # refglobs.
@ -1268,7 +1268,7 @@ class TestGitCl(TestCase):
remote_url='https://chromium.googlesource.com/chromium/src', remote_url='https://chromium.googlesource.com/chromium/src',
remote_ref='refs/arbitrary/ref') remote_ref='refs/arbitrary/ref')
self.assertEqual(res.pending_prefix, None) self.assertEqual(res.pending_prefix, None)
self.assertEqual(res.should_git_number, False) self.assertEqual(res.should_add_git_number, False)
@classmethod @classmethod
def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False): def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):

Write Preview
Loading…
Cancel
Save