summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2021-04-15 10:54:17 +0200
committerFlorian Bruhin <me@the-compiler.org>2021-04-29 09:34:51 +0200
commit7d93098fd0f305f842940d94963c2b9aa6186505 (patch)
treee15d3bf46c161d5593e28d6c75fa07ca238ff399
parent73ce4ef9e18fd5514a0748637c0f4418da3d79e9 (diff)
downloadqutebrowser-7d93098fd0f305f842940d94963c2b9aa6186505.tar.gz
qutebrowser-7d93098fd0f305f842940d94963c2b9aa6186505.zip
tests: Fix test_version with git's init.defaultBranch
(cherry picked from commit 32604a6651813e25ee6d328c880ef95f76c9c744)
-rw-r--r--tests/unit/utils/test_version.py11
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/unit/utils/test_version.py b/tests/unit/utils/test_version.py
index 59f9052ca..b50352e34 100644
--- a/tests/unit/utils/test_version.py
+++ b/tests/unit/utils/test_version.py
@@ -484,8 +484,17 @@ class TestGitStrSubprocess:
@needs_git
def test_real_git(self, git_repo):
"""Test with a real git repository."""
+ branch_name = subprocess.run(
+ ['git', 'config', 'init.defaultBranch'],
+ check=False,
+ stdout=subprocess.PIPE,
+ encoding='utf-8',
+ ).stdout.strip()
+ if not branch_name:
+ branch_name = 'master'
+
ret = version._git_str_subprocess(str(git_repo))
- assert ret == '6e4b65a on master (1970-01-01 01:00:00 +0100)'
+ assert ret == f'6e4b65a on {branch_name} (1970-01-01 01:00:00 +0100)'
def test_missing_dir(self, tmp_path):
"""Test with a directory which doesn't exist."""