Unskip testGetBranchesInfo().

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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=295814

[Raphael Kubo da Costa (rakuco), 2015-06-23 12:41:36]

PTAL. We first came across those errors in for-each-ref in
https://codereview.chromium.org/802403003 last year. At the time the Chromium
bots were just updated to a certain version that happened to produce the
expected results by chance, as git itself was buggy -- I fixed it in this commit
present since 2.3.0:
https://github.com/git/git/commit/b6160d950c9ef168d0f7d7c9b2812f280e5b88fb

I'm just not sure whether it makes sense to have MIN_UPSTREAM_TRACK_GIT_FOR_TEST
or bump MIN_UPSTREAM_TRACK_GIT_VERSION instead.

[pgervais, 2015-06-24 00:52:51]

On 2015/06/23 12:41:36, Raphael Kubo da Costa (rakuco) wrote:
> PTAL. We first came across those errors in for-each-ref in
> https://codereview.chromium.org/802403003 last year. At the time the Chromium
> bots were just updated to a certain version that happened to produce the
> expected results by chance, as git itself was buggy -- I fixed it in this
commit
> present since 2.3.0:
> https://github.com/git/git/commit/b6160d950c9ef168d0f7d7c9b2812f280e5b88fb
> 
> I'm just not sure whether it makes sense to have
MIN_UPSTREAM_TRACK_GIT_FOR_TEST
> or bump MIN_UPSTREAM_TRACK_GIT_VERSION instead.

lgtm. I would bump MIN_UPSTREAM_TRACK_GIT_VERSION. It won't break anything
running in production afaict.

[Raphael Kubo da Costa (rakuco), 2015-06-24 08:40:06]

The CQ bit was checked by raphael.kubo.da.costa@intel.com

[Raphael Kubo da Costa (rakuco), 2015-06-24 08:40:06]

The patchset sent to the CQ was uploaded after l-g-t-m from
pgervais@chromium.org
Link to the patchset: https://codereview.chromium.org/1195933003/#ps20001
(title: "Patch v2, without extra variable in the tests")

[commit-bot: I haz the power, 2015-06-24 08:40:20]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1195933003/20001

[commit-bot: I haz the power, 2015-06-24 08:45:08]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-24 08:45:09]

Try jobs failed on following builders:
  depot_tools_presubmit on tryserver.chromium.linux (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.linux/builders/depot_tools_pre...)

[Raphael Kubo da Costa (rakuco), 2015-06-24 08:49:44]

The CQ bit was checked by raphael.kubo.da.costa@intel.com

[commit-bot: I haz the power, 2015-06-24 08:49:54]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1195933003/20001

[commit-bot: I haz the power, 2015-06-24 08:54:42]

Committed patchset #2 (id:20001) as
http://src.chromium.org/viewvc/chrome?view=rev&revision=295814