From 5df79ca4314fd519e85b78a144e7a57dc58d0fd1 Mon Sep 17 00:00:00 2001 From: "akuegel@chromium.org" Date: Mon, 13 Apr 2015 13:59:24 +0000 Subject: [PATCH] Fix git_cl_tests. BUG=356813 Review URL: https://codereview.chromium.org/1083693002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@294777 0039d316-1c4b-4281-b951-d872f2087c98 --- tests/git_cl_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index ed1d7a563..0c5bd373c 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -170,13 +170,13 @@ class TestGitCl(TestCase): ((['get_or_create_merge_base', 'master', 'master'],), 'fake_ancestor_sha'), ((['git', 'config', 'gerrit.host'],), ''), - ((['git', 'config', 'branch.master.rietveldissue'],), ''), ] + cls._git_sanity_checks('fake_ancestor_sha', 'master') + [ ((['git', 'rev-parse', '--show-cdup'],), ''), ((['git', 'rev-parse', 'HEAD'],), '12345'), ((['git', 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],), 'M\t.gitignore\n'), + ((['git', 'config', 'branch.master.rietveldissue'],), ''), ((['git', 'config', 'branch.master.rietveldpatchset'],), ''), ((['git', 'log', '--pretty=format:%s%n%n%b',