From 8f15f3ec1dbfbb6b6c0bc98eedc7a323d02fe317 Mon Sep 17 00:00:00 2001 From: Andrii Shyshkalov Date: Wed, 14 Dec 2016 15:43:49 +0100 Subject: [PATCH] git cl refactor: s/should_git_number/should_add_git_number R=sergiyb@google.com BUG=chromium:642493 Change-Id: Id7b732d82c25ce88a3295ff54c79cf2a66e0d5b9 Reviewed-on: https://chromium-review.googlesource.com/419437 Reviewed-by: Sergiy Byelozyorov Commit-Queue: Andrii Shyshkalov --- git_cl.py | 4 ++-- tests/git_cl_test.py | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/git_cl.py b/git_cl.py index 46af2bce17..c13d6a638f 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1160,7 +1160,7 @@ class _GitNumbererState(object): return self._pending_prefix @property - def should_git_number(self): + def should_add_git_number(self): 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 - 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 # is no pending ref to push to? logging.debug('Adding git number footers') diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index d68129daef..71f3ed6d22 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -1169,7 +1169,7 @@ class TestGitCl(TestCase): remote_url='https://chromium.googlesource.com/chromium/tools/build', remote_ref='refs/whatever') 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): self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) @@ -1185,7 +1185,7 @@ class TestGitCl(TestCase): remote_url='https://chromium.googlesource.com/chromium/src', remote_ref='refs/whatever') 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): self.mock(git_cl.sys, 'stdout', StringIO.StringIO()) @@ -1203,7 +1203,7 @@ class TestGitCl(TestCase): remote_url='https://chromium.googlesource.com/chromium/src', remote_ref='refs/whatever') 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): class NamedTempFileStab(StringIO.StringIO): @@ -1248,19 +1248,19 @@ class TestGitCl(TestCase): remote_url='https://chromium.googlesource.com/chromium/src', remote_ref='refs/heads/master') 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( remote_url='https://chromium.googlesource.com/chromium/src', remote_ref='refs/heads/test') 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( remote_url='https://chromium.googlesource.com/chromium/src', remote_ref='refs/heads/disabled') 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 # refglobs. @@ -1268,7 +1268,7 @@ class TestGitCl(TestCase): remote_url='https://chromium.googlesource.com/chromium/src', remote_ref='refs/arbitrary/ref') self.assertEqual(res.pending_prefix, None) - self.assertEqual(res.should_git_number, False) + self.assertEqual(res.should_add_git_number, False) @classmethod def _gerrit_ensure_auth_calls(cls, issue=None, skip_auth_check=False):