openstack
/
reno
Code Issues Proposed changes

Merge "Fix scanner tests failing with modern Git"

This commit is contained in:
Zuul 2023-03-08 10:07:42 +00:00 committed by Gerrit Code Review
parent 64f649cd72 2caaa2ab5e
commit 19d0cece3e
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
reno/tests/test_scanner.py
View File

@ -127,13 +127,26 @@ class GitRepoFixture(fixtures.Fixture):
def __init__(self, reporoot):
self.reporoot = reporoot
git_version_re = re.compile(r'^git version (\d+)\.(\d+)')
git_version_raw = utils.check_output(['git', '--version'])
git_version_match = git_version_re.match(git_version_raw)
self.git_version = (
int(git_version_match.group(1)),
int(git_version_match.group(2)),
)
super(GitRepoFixture, self).__init__()
def setUp(self):
super(GitRepoFixture, self).setUp()
self.useFixture(GPGKeyFixture())
os.makedirs(self.reporoot)
self.git('init', '.')
if self.git_version > (2, 27):
# The branch defaults to `main` on modern Git.
self.git('init', '.', '--initial-branch', 'master')
else:
self.git('init', '.')
self.git('config', '--local', 'user.email', 'example@example.com')
self.git('config', '--local', 'user.name', 'reno developer')
self.git('config', '--local', 'user.signingkey',