commit deff57f9b2c816e47aa6a94edaf019e244adff63
author Josip Sokcevic <sokcevic@google.com> Wed Nov 04 19:36:42 2020 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Nov 04 19:36:42 2020 +0000
tree 7b5a6fef466a290fdb20595f4677d459c8eae185
parent 5bdfcd8f3397c0a51b1539d672a9ed10d4caf239

Add unit tests for guessing main as upstream

R=ehmaldonado@chromium.org

Bug: 1143724
Change-Id: I69ce296a27b36c1073999f2b3c51421ac94e7ef2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2519254
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>

tests/scm_unittest.py

diff --git a/tests/scm_unittest.py b/tests/scm_unittest.py
index 5584d59..130e4f1 100755
--- a/tests/scm_unittest.py
+++ b/tests/scm_unittest.py
@@ -185,6 +185,12 @@
     self.assertEqual(
         ('origin', 'refs/heads/master'), scm.GIT.FetchUpstreamTuple(self.cwd))
 
+  @mock.patch('scm.GIT.GetRemoteBranches',
+              return_value=['origin/master', 'origin/main'])
+  def testFetchUpstreamTuple_GuessOriginMain(self, _mockGetRemoteBranches):
+    self.assertEqual(('origin', 'refs/heads/main'),
+                     scm.GIT.FetchUpstreamTuple(self.cwd))
+
   def testFetchUpstreamTuple_RietveldUpstreamConfig(self):
     scm.GIT.SetConfig(self.cwd, 'rietveld.upstream-branch', 'rietveld-upstream')
     scm.GIT.SetConfig(self.cwd, 'rietveld.upstream-remote', 'rietveld-remote')