Move MockedChangelog to testutils

and allow to specify the content so we can reuse it for other dch
tests.

diff --git a/tests/03_test_dch_guess_version.py b/tests/03_test_dch_guess_version.py
index 97a485087c57a188f97d88ec380e364a24a57a09..6109bfb372dd58e0309e6f0a32e12780b6aa8749 100644 (file)
--- a/tests/03_test_dch_guess_version.py
+++ b/tests/03_test_dch_guess_version.py
@@ -5,29 +5,15 @@
 from . import context
 
 import testutils
-import unittest
 
 from gbp.scripts import dch
-from gbp.deb.changelog import ChangeLog
-
-
-class MockedChangeLog(ChangeLog):
-    contents = """foo (%s) experimental; urgency=low
-
-  * a important change
-
- -- Debian Maintainer <maint@debian.org>  Sat, 01 Jan 2012 00:00:00 +0100"""
-
-    def __init__(self, version):
-        ChangeLog.__init__(self, contents=self.contents % version)
-
 
 class TestGuessVersionFromUpstream(testutils.DebianGitTestRepo):
     """Test guess_version_from_upstream"""
 
     def test_guess_no_epoch(self):
         """Guess the new version from the upstream tag"""
-        cp = MockedChangeLog('1.0-1')
+        cp = testutils.MockedChangeLog('1.0-1')
         tagformat = 'upstream/%(version)s'
         uversion = '1.1'
 
@@ -43,7 +29,7 @@ class TestGuessVersionFromUpstream(testutils.DebianGitTestRepo):
 
     def test_guess_epoch(self):
         """Check if we picked up the epoch correctly (#652366)"""
-        cp = MockedChangeLog('1:1.0-1')
+        cp = testutils.MockedChangeLog('1:1.0-1')
 
         tagformat = 'upstream/%(version)s'
         uversion = '1.1'
@@ -58,5 +44,3 @@ class TestGuessVersionFromUpstream(testutils.DebianGitTestRepo):
                                                   cp)
 
         self.assertEqual('1:1.1-1', guessed)
-
-

diff --git a/tests/testutils.py b/tests/testutils.py
index 0f953bce4278ce30242be9704521999f7aa12b49..617a7abc178eca4912b6837f1439db7d17172b57 100644 (file)
--- a/tests/testutils.py
+++ b/tests/testutils.py
@@ -8,6 +8,7 @@ import unittest
 import gbp.log
 import gbp.deb.git
 import gbp.errors
+from gbp.deb.changelog import ChangeLog
 
 class DebianGitTestRepo(unittest.TestCase):
     """Scratch repo for a single unit test"""
@@ -74,3 +75,15 @@ class OsReleaseFile(object):
 
     def __repr__(self):
         return repr(self._values)
+
+class MockedChangeLog(ChangeLog):
+    contents = """foo (%s) experimental; urgency=low
+
+  %s
+
+ -- Debian Maintainer <maint@debian.org>  Sat, 01 Jan 2012 00:00:00 +0100"""
+
+    def __init__(self, version, changes = "a important change"):
+        ChangeLog.__init__(self,
+                           contents=self.contents % (version, changes))
+