Skip to content

Commit

Permalink
Add test for the new changes entry format
Browse files Browse the repository at this point in the history
  • Loading branch information
Vogtinator committed Aug 12, 2024
1 parent 8d8a9cd commit a8a6ccb
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions tests/gitsvntests.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,22 @@ def _check_changes(self, orig_changes, expected_changes_regexp):

def test_changesgenerate_new_commit_and_changes_file(self): # pylint: disable=C0103
self._test_changesgenerate_new_commit_and_changes_file(
self.fixtures.user_email)
self.fixtures.user_email, self.fixtures.user_email)

def test_changesgenerate_new_commit_and_changes_file_default_author(self): # pylint: disable=C0103
os.environ['OBS_SERVICE_DAEMON'] = "1"
self._test_changesgenerate_new_commit_and_changes_file()
self._test_changesgenerate_new_commit_and_changes_file(None, 'obs-service-tar-scm@invalid')
os.environ['OBS_SERVICE_DAEMON'] = "0"

def test_changesgenerate_new_commit_and_changes_file_full_author(self): # pylint: disable=C0103
os.environ['OBS_SERVICE_DAEMON'] = "1"
os.environ['VC_REALNAME'] = 'Tar Scm Service'
os.environ['VC_MAILADDR'] = 'obs-service-tar-scm@invalid'
self._test_changesgenerate_new_commit_and_changes_file(None, 'Tar Scm Service <obs-service-tar-scm@invalid>')
os.environ['OBS_SERVICE_DAEMON'] = "0"
del os.environ['VC_REALNAME']
del os.environ['VC_MAILADDR']

def _write_servicedata(self, rev):
with open(os.path.join(self.pkgdir, '_servicedata'), 'w') as sdat:
sdat.write(textwrap.dedent("""\
Expand All @@ -129,16 +138,16 @@ def _write_servicedata(self, rev):
</service>
</servicedata>""" % (self.fixtures.repo_url, self.changesrevision(rev))))

def _test_changesgenerate_new_commit_and_changes_file(self, author=None): # pylint: disable=C0103
def _test_changesgenerate_new_commit_and_changes_file(self, changesauthor, expected_author): # pylint: disable=C0103
self._write_servicedata(2)
orig_changes = self._write_changes_file()
self.fixtures.create_commits(3)
rev = 5
print("XXXX 1")
tar_scm_args = self.tar_scm_args()

if author is not None:
tar_scm_args += ['--changesauthor', self.fixtures.user_email]
if changesauthor is not None:
tar_scm_args += ['--changesauthor', changesauthor]

print("XXXX 2")
self.tar_scm_std(*tar_scm_args)
Expand All @@ -149,7 +158,6 @@ def _test_changesgenerate_new_commit_and_changes_file(self, author=None): # pyl
rev = self.changesrevision(rev, abbrev=True)

print("XXXX 4")
expected_author = author or 'obs-service-tar-scm@invalid'
expected_changes_regexp = self._new_change_entry_regexp(
expected_author,
textwrap.dedent("""\
Expand Down

0 comments on commit a8a6ccb

Please sign in to comment.