Don't call settings.GetIsGerrit() before parser.parse_args()
settings.GetIsGerrit() would invoke logging.basicConfig() and
preemtps the basicConfig for verbose option in parser.parse_args.
R=maruel@chromium.org,ilevy@chromium.org
BUG=162600
Review URL: https://chromiumcodereview.appspot.com/11418171
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@169843 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index ce3761c..4b089b3 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -126,7 +126,6 @@
'-M'+similarity, 'fake_ancestor_sha'],), '+dat')
return [
- ((['git', 'config', 'gerrit.host'],), ''),
((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
((['git', 'symbolic-ref', 'HEAD'],), 'master'),
similarity_call,
@@ -149,6 +148,7 @@
'foo'),
((['git', 'config', 'user.email'],), 'me@example.com'),
stat_call,
+ ((['git', 'config', 'gerrit.host'],), ''),
((['git', 'log', '--pretty=format:%s\n\n%b', 'fake_ancestor_sha..'],),
'desc\n'),
]
@@ -433,7 +433,6 @@
@classmethod
def _gerrit_base_calls(cls):
return [
- ((['git', 'config', 'gerrit.host'],), 'gerrit.example.com'),
((['git', 'config', 'rietveld.server'],), 'codereview.example.com'),
((['git', 'symbolic-ref', 'HEAD'],), 'master'),
((['git', 'config', '--int', '--get',
@@ -465,6 +464,7 @@
@staticmethod
def _gerrit_upload_calls(description, reviewers):
calls = [
+ ((['git', 'config', 'gerrit.host'],), 'gerrit.example.com'),
((['git', 'log', '--pretty=format:%s\n\n%b', 'fake_ancestor_sha..'],),
description)
]