Skip to content

Commit 29f3a9d

Browse files
committed
test: fix tests depending on default branch name
1 parent 49c8433 commit 29f3a9d

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

test/test_git.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import unittest
77

88
import boilerplates.git_repo_tests
9+
import git
910

1011
from version_query.version import VersionComponent, Version
1112
from version_query.git_query import query_git_repo, predict_git_repo
@@ -24,6 +25,8 @@ class Tests(boilerplates.git_repo_tests.GitRepoTests):
2425

2526
def setUp(self):
2627
super().setUp()
28+
self.default_branch_name = git.GitConfigParser(
29+
read_only=True).get_value('init', 'defaultBranch', default='master')
2730
self.git_init()
2831

2932
def test_empty_repo(self):
@@ -99,7 +102,7 @@ def test_nonversion_merged_branches(self):
99102
self.repo.git.checkout('devel')
100103
self.git_commit_new_file()
101104
self.repo.create_tag('error')
102-
self.repo.git.checkout('master')
105+
self.repo.git.checkout(self.default_branch_name)
103106
self.repo.git.merge('devel')
104107
self.repo.git.merge('experimental')
105108
self.git_commit_new_file()
@@ -156,7 +159,7 @@ def test_nonlatest_commit(self):
156159
self.git_commit_new_file()
157160
self.repo.create_tag('v0.2.0')
158161
self.git_commit_new_file()
159-
self.repo.git.checkout('master')
162+
self.repo.git.checkout(self.default_branch_name)
160163
current_version = query_git_repo(self.repo_path)
161164
self.assertEqual(current_version.to_str(), '0.1.0')
162165
upcoming_version = predict_git_repo(self.repo_path)
@@ -179,7 +182,7 @@ def test_tags_on_merged_branches(self):
179182
self.git_commit_new_file()
180183
self.repo.create_tag('v0.1.0')
181184
self.git_commit_new_file()
182-
self.repo.git.checkout('master')
185+
self.repo.git.checkout(self.default_branch_name)
183186
self.repo.git.merge('devel')
184187
self.git_commit_new_file()
185188
current_version = query_git_repo(self.repo_path)
@@ -194,7 +197,7 @@ def test_tag_on_merged_branch(self):
194197
self.repo.git.checkout('devel')
195198
self.git_commit_new_file()
196199
self.repo.create_tag('v1.0.0')
197-
self.repo.git.checkout('master')
200+
self.repo.git.checkout(self.default_branch_name)
198201
self.repo.git.merge('devel')
199202
current_version = query_git_repo(self.repo_path)
200203
self.assertEqual(current_version.to_str(), '1.0.0')

0 commit comments

Comments
 (0)