Split out building a debian version from an upstream commit

based on a patch by Daniel Dehennin

Needed for #672954, #646684, #669171

1 files changed, 25 insertions, 20 deletions

diff --git a/tests/03_test_dch_guess_version.py b/tests/03_test_dch_guess_version.py
index d954459d..8bcd4e53 100644
--- a/tests/03_test_dch_guess_version.py
+++ b/tests/03_test_dch_guess_version.py
@@ -2,22 +2,10 @@
 
 """Test L{Changelog}'s guess_version_from_upstream"""
 
-import unittest
+import testutils
 
 from gbp.scripts import dch
-from gbp.errors import GbpError
 from gbp.deb.changelog import ChangeLog
-from gbp.deb.git import DebianGitRepository
-
-class MockGitRepository(object):
-    def __init__(self, upstream_tag):
-        self.upstream_tag = upstream_tag
-
-    def find_tag(self, branch, pattern):
-        return self.upstream_tag
-
-    def tag_to_version(self, tag, format):
-        return DebianGitRepository.tag_to_version(tag, format)
 
 
 class MockedChangeLog(ChangeLog):
@@ -31,24 +19,41 @@ class MockedChangeLog(ChangeLog):
         ChangeLog.__init__(self, contents=self.contents % version)
 
 
-class TestGuessVersionFromUpstream(unittest.TestCase):
+class TestGuessVersionFromUpstream(testutils.DebianGitTestRepo):
     """Test guess_version_from_upstream"""
+
     def test_guess_no_epoch(self):
         """Guess the new version from the upstream tag"""
-        repo = MockGitRepository(upstream_tag='upstream/1.1')
         cp = MockedChangeLog('1.0-1')
-        guessed = dch.guess_version_from_upstream(repo,
-                                                  'upstream/%(version)s',
+        tagformat = 'upstream/%(version)s'
+        uversion = '1.1'
+
+        self.add_file('doesnot', 'matter')
+        tag = self.repo.version_to_tag(tagformat, uversion)
+        self.repo.create_tag(name=tag, msg="Upstream release %s" % uversion,
+                             sign=False)
+
+        guessed = dch.guess_version_from_upstream(self.repo,
+                                                  tagformat,
                                                   cp)
         self.assertEqual('1.1-1', guessed)
 
     def test_guess_epoch(self):
         """Check if we picked up the epoch correctly (#652366)"""
-        repo = MockGitRepository(upstream_tag='upstream/1.1')
         cp = MockedChangeLog('1:1.0-1')
-        guessed = dch.guess_version_from_upstream(repo,
-                                                  'upstream/%(version)s',
+
+        tagformat = 'upstream/%(version)s'
+        uversion = '1.1'
+
+        self.add_file('doesnot', 'matter')
+        tag = self.repo.version_to_tag(tagformat, uversion)
+        self.repo.create_tag(name=tag, msg="Upstream release %s" % uversion,
+                             sign=False)
+
+        guessed = dch.guess_version_from_upstream(self.repo,
+                                                  tagformat,
                                                   cp)
+
         self.assertEqual('1:1.1-1', guessed)