diff options
Diffstat (limited to 'tests/03_test_dch_guess_version.py')
| -rw-r--r-- | tests/03_test_dch_guess_version.py | 35 |
1 files changed, 34 insertions, 1 deletions
diff --git a/tests/03_test_dch_guess_version.py b/tests/03_test_dch_guess_version.py index 38d097c2..d7035018 100644 --- a/tests/03_test_dch_guess_version.py +++ b/tests/03_test_dch_guess_version.py @@ -15,14 +15,18 @@ class TestGuessVersionFromUpstream(testutils.DebianGitTestRepo): cp = testutils.MockedChangeLog('1.0-1') tagformat = 'upstream/%(version)s' uversion = '1.1' + upstream_branch = 'upstream' + self.add_file('doesnot', 'matter') + self.repo.create_branch('upstream') tag = self.repo.version_to_tag(tagformat, uversion) self.repo.create_tag(name=tag, msg="Upstream release %s" % uversion, sign=False) - + self.repo.set_branch("master") guessed = dch.guess_version_from_upstream(self.repo, tagformat, + upstream_branch, cp) self.assertEqual('1.1-1', guessed) @@ -32,14 +36,43 @@ class TestGuessVersionFromUpstream(testutils.DebianGitTestRepo): tagformat = 'upstream/%(version)s' uversion = '1.1' + upstream_branch = 'upstream' self.add_file('doesnot', 'matter') + self.repo.create_branch('upstream') tag = self.repo.version_to_tag(tagformat, uversion) self.repo.create_tag(name=tag, msg="Upstream release %s" % uversion, sign=False) + self.repo.set_branch("master") guessed = dch.guess_version_from_upstream(self.repo, tagformat, + upstream_branch, cp) self.assertEqual('1:1.1-1', guessed) + + def test_guess_upstream_tag_clash_with_non_upstream_tag(self): + """Guess with clashing upstream- and non-upstream-tag""" + cp = testutils.MockedChangeLog('0.9-1') + + tagformat = 'v%(version)s' + uversion = '1.0' + upstream_branch = 'upstream' + + self.add_file('doesnot', 'matter') + self.repo.create_branch('upstream') + tag = self.repo.version_to_tag(tagformat, uversion) + self.repo.create_tag(name=tag, msg="Upstream release %s" % uversion, + sign=False) + self.repo.set_branch("master") + self.add_file("clash", "bar") + self.repo.create_tag("vyatta/something", msg="some non-upstream tag but not package release tag either") + self.add_file("clash2", "bar") + + guessed = dch.guess_version_from_upstream(self.repo, + tagformat, + upstream_branch, + cp) + + self.assertEqual('1.0-1', guessed) |