summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@google.com>2020-11-16 22:56:35 -0500
committerMike Frysinger <vapier@google.com>2020-11-17 04:29:09 +0000
commite283b95cf2c95befcb2b67259fd8877c1c36d25e (patch)
tree8794fda555f97c30337bf2dc7a3cad9aa62c88d2
parentdc5c4d1d117304345ebec71a852184859883e1eb (diff)
downloadgit-repo-e283b95cf2c95befcb2b67259fd8877c1c36d25e.tar.gz
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>
-rw-r--r--tests/test_project.py6
-rw-r--r--tests/test_wrapper.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/test_project.py b/tests/test_project.py
index 4e710ae5..924a2459 100644
--- a/tests/test_project.py
+++ b/tests/test_project.py
@@ -77,7 +77,7 @@ class ReviewableBranchTests(unittest.TestCase):
77 77
78 # Start off with the normal details. 78 # Start off with the normal details.
79 rb = project.ReviewableBranch( 79 rb = project.ReviewableBranch(
80 fakeproj, fakeproj.config.GetBranch('work'), 'master') 80 fakeproj, fakeproj.config.GetBranch('work'), 'main')
81 self.assertEqual('work', rb.name) 81 self.assertEqual('work', rb.name)
82 self.assertEqual(1, len(rb.commits)) 82 self.assertEqual(1, len(rb.commits))
83 self.assertIn('Del file', rb.commits[0]) 83 self.assertIn('Del file', rb.commits[0])
@@ -90,9 +90,9 @@ class ReviewableBranchTests(unittest.TestCase):
90 self.assertTrue(rb.date) 90 self.assertTrue(rb.date)
91 91
92 # Now delete the tracking branch! 92 # Now delete the tracking branch!
93 fakeproj.work_git.branch('-D', 'master') 93 fakeproj.work_git.branch('-D', 'main')
94 rb = project.ReviewableBranch( 94 rb = project.ReviewableBranch(
95 fakeproj, fakeproj.config.GetBranch('work'), 'master') 95 fakeproj, fakeproj.config.GetBranch('work'), 'main')
96 self.assertEqual(0, len(rb.commits)) 96 self.assertEqual(0, len(rb.commits))
97 self.assertFalse(rb.base_exists) 97 self.assertFalse(rb.base_exists)
98 # Hard to assert anything useful about this. 98 # Hard to assert anything useful about this.
diff --git a/tests/test_wrapper.py b/tests/test_wrapper.py
index e18ceb19..d22dc4ee 100644
--- a/tests/test_wrapper.py
+++ b/tests/test_wrapper.py
@@ -402,8 +402,8 @@ class ResolveRepoRev(GitCheckoutTestCase):
402 self.assertEqual('refs/heads/stable', rrev) 402 self.assertEqual('refs/heads/stable', rrev)
403 self.assertEqual(self.REV_LIST[1], lrev) 403 self.assertEqual(self.REV_LIST[1], lrev)
404 404
405 rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'master') 405 rrev, lrev = self.wrapper.resolve_repo_rev(self.GIT_DIR, 'main')
406 self.assertEqual('refs/heads/master', rrev) 406 self.assertEqual('refs/heads/main', rrev)
407 self.assertEqual(self.REV_LIST[0], lrev) 407 self.assertEqual(self.REV_LIST[0], lrev)
408 408
409 def test_tag_name(self): 409 def test_tag_name(self):