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
2 files changed
tree: 33b338ce94dd5c1893bffef81db47f4598256a7e
  1. bootstrap/
  2. git-templates/
  3. git_utils/
  4. infra/
  5. man/
  6. recipes/
  7. support/
  8. testing_support/
  9. tests/
  10. third_party/
  11. win_toolchain/
  12. zsh-goodies/
  13. .gitignore
  14. .style.yapf
  15. LICENSE
  16. OWNERS
  17. PRESUBMIT.py
  18. README
  19. README.codereview
  20. README.gclient
  21. README.git-cl
  22. README.testing
  23. WATCHLISTS
  24. annotated_gclient.py
  25. apply_issue
  26. apply_issue.bat
  27. apply_issue.py
  28. auth.py
  29. breakpad.py
  30. buildbucket.py
  31. checkout.py
  32. chrome-update-create-task.bat
  33. chrome-update.bat
  34. chrome-update.py
  35. clang-format
  36. clang-format.bat
  37. clang_format.py
  38. codereview.settings
  39. commit_queue
  40. commit_queue.bat
  41. commit_queue.py
  42. cpplint.bat
  43. cpplint.py
  44. cpplint_chromium.py
  45. create-chromium-git-src
  46. create-ntfs-junction.c
  47. create-ntfs-junction.exe
  48. dart_format.py
  49. depot-tools-auth
  50. depot-tools-auth.bat
  51. depot-tools-auth.py
  52. download_from_google_storage
  53. download_from_google_storage.bat
  54. download_from_google_storage.py
  55. drover
  56. drover.bat
  57. drover.py
  58. fetch
  59. fetch.bat
  60. fetch.py
  61. fix_encoding.py
  62. gcl
  63. gcl.bat
  64. gcl.py
  65. gclient
  66. gclient-new-workdir.py
  67. gclient.bat
  68. gclient.py
  69. gclient_completion.sh
  70. gclient_scm.py
  71. gclient_utils.py
  72. gerrit_util.py
  73. git-auto-svn
  74. git-cache
  75. git-cherry-pick-upload
  76. git-cl
  77. git-cl-upload-hook
  78. git-crrev-parse
  79. git-crsync
  80. git-crup
  81. git-footers
  82. git-freeze
  83. git-gs
  84. git-lkgr
  85. git-map
  86. git-map-branches
  87. git-mark-merge-base
  88. git-nav-downstream
  89. git-nav-upstream
  90. git-new-branch
  91. git-number
  92. git-rebase-update
  93. git-rename-branch
  94. git-reparent-branch
  95. git-retry
  96. git-runhooks
  97. git-squash-branch
  98. git-thaw
  99. git-try
  100. git-upstream-diff
  101. git_auto_svn.py
  102. git_cache.py
  103. git_cherry_pick_upload.py
  104. git_cl.py
  105. git_common.py
  106. git_footers.py
  107. git_freezer.py
  108. git_map.py
  109. git_map_branches.py
  110. git_mark_merge_base.py
  111. git_nav_downstream.py
  112. git_new_branch.py
  113. git_number.py
  114. git_rebase_update.py
  115. git_rename_branch.py
  116. git_reparent_branch.py
  117. git_retry.py
  118. git_squash_branch.py
  119. git_try.py
  120. git_upstream_diff.py
  121. gn
  122. gn.bat
  123. gn.py
  124. gsutil.py
  125. hammer
  126. hammer.bat
  127. my_activity.py
  128. my_reviews.py
  129. ninja
  130. ninja-linux32
  131. ninja-linux64
  132. ninja-mac
  133. ninja.exe
  134. owners.py
  135. owners_finder.py
  136. patch.py
  137. presubmit_canned_checks.py
  138. presubmit_support.py
  139. profile.xml
  140. pylint
  141. pylint.py
  142. pylintrc
  143. python_git_runner.sh
  144. repo
  145. rietveld.py
  146. roll-dep
  147. roll-dep-svn
  148. roll-dep-svn.bat
  149. roll-dep.bat
  150. roll_dep.py
  151. roll_dep_svn.py
  152. scm.py
  153. subcommand.py
  154. subprocess2.py
  155. trychange.py
  156. update_depot_tools
  157. update_depot_tools.bat
  158. upload_to_google_storage.py
  159. watchlists.py
  160. weekly
  161. wtf