tree 33b338ce94dd5c1893bffef81db47f4598256a7e
parent 39a23508dc3503af629c0b4ac58105281a7fba90
author raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com> 1435136081 +0000
committer raphael.kubo.da.costa@intel.com <raphael.kubo.da.costa@intel.com> 1435136081 +0000

Unskip testGetBranchesInfo().

It is not clear why it was skipped in r293502, but it was problematic
before that as it can be seen from CL 802403003.

The reason for the different results (and likely the reason why the test
was skipped) is that the handling of the %(upstream:track) and
%(upstream:trackhort) formatting tags was broken in git itself until
version 2.3.0. This was fixed in git commit b6160d95, and the fix shows
that the test expectations in testGetBranchesInfo() were actually wrong
in one of the cases.

Fix the expectations and make sure we only use %(upstream:track) in the
test when a suitable git version is present.

R=pgervais@chromium.org,iannucci@chromium.org

Review URL: https://codereview.chromium.org/1195933003

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295814 0039d316-1c4b-4281-b951-d872f2087c98