commit e283b95cf2c95befcb2b67259fd8877c1c36d25e
author Mike Frysinger <vapier@google.com> Mon Nov 16 22:56:35 2020 -0500
committer Mike Frysinger <vapier@google.com> Tue Nov 17 04:29:09 2020 +0000
tree 8794fda555f97c30337bf2dc7a3cad9aa62c88d2
parent dc5c4d1d117304345ebec71a852184859883e1eb

tests: use new main branch

Now that we clone "main" by default, use that for our local test.

Change-Id: Ib8420074bdfabfcb9d5252a3a0ecd3d852ca36e8
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/288422
Reviewed-by: Jonathan Nieder <jrn@google.com>
Tested-by: Mike Frysinger <vapier@google.com>

tests/test_project.py

diff --git a/tests/test_project.py b/tests/test_project.py
index 4e710ae..924a245 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -77,7 +77,7 @@
 
       # Start off with the normal details.
       rb = project.ReviewableBranch(
-          fakeproj, fakeproj.config.GetBranch('work'), 'master')
+          fakeproj, fakeproj.config.GetBranch('work'), 'main')
       self.assertEqual('work', rb.name)
       self.assertEqual(1, len(rb.commits))
       self.assertIn('Del file', rb.commits[0])
@@ -90,9 +90,9 @@
       self.assertTrue(rb.date)
 
       # Now delete the tracking branch!
-      fakeproj.work_git.branch('-D', 'master')
+      fakeproj.work_git.branch('-D', 'main')
       rb = project.ReviewableBranch(
-          fakeproj, fakeproj.config.GetBranch('work'), 'master')
+          fakeproj, fakeproj.config.GetBranch('work'), 'main')
       self.assertEqual(0, len(rb.commits))
       self.assertFalse(rb.base_exists)
       # Hard to assert anything useful about this.

tests/test_wrapper.py

diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py
index e18ceb1..d22dc4e 100644
--- a/tests/test_wrapper.py
+++ b/tests/test_wrapper.py
@@ -402,8 +402,8 @@
     self.assertEqual('refs/heads/stable', rrev)
     self.assertEqual(self.REV_LIST[1], lrev)
 
-    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'master')
-    self.assertEqual('refs/heads/master', rrev)
+    rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'main')
+    self.assertEqual('refs/heads/main', rrev)
     self.assertEqual(self.REV_LIST[0], lrev)
 
   def test_tag_name(self):