[Pkg-bazaar-commits] ./bzr-builddeb/trunk.old r239: Fix up tests to work with new version of changelog.py

[James Westby]

------------------------------------------------------------
revno: 239
committer: James Westby <jw+debian at jameswestby.net>
branch nick: read-only-import
timestamp: Fri 2008-07-11 22:45:33 +0100
message:
  Fix up tests to work with new version of changelog.py
modified:
  merge_upstream.py
  tests/test_merge_upstream.py
  tests/test_util.py
-------------- next part --------------
=== modified file 'merge_upstream.py'
--- a/merge_upstream.py	2008-03-05 17:00:51 +0000
+++ b/merge_upstream.py	2008-07-11 21:45:33 +0000
@@ -80,7 +80,8 @@
    cl_id = tree.path2id('debian/changelog')
    if cl_id is None:
      raise AddChangelogError('debian/changelog')
-   cl = Changelog(tree.get_file_text(cl_id))
+   cl = Changelog()
+   cl.parse_changelog(tree.get_file_text(cl_id), max_blocks=1)
    upstream_version = cl.upstream_version
    tag = make_upstream_tag(upstream_version)
    return tree.branch.tags.lookup_tag(tag)

=== modified file 'tests/test_merge_upstream.py'
--- a/tests/test_merge_upstream.py	2008-03-05 17:00:51 +0000
+++ b/tests/test_merge_upstream.py	2008-07-11 21:45:33 +0000
@@ -67,7 +67,7 @@
                  version=Version('0.1-1'),
                  distributions='unstable',
                  urgency='low',
-                 author='James Westby <jw+debian at jameswestby.net',
+                 author='James Westby <jw+debian at jameswestby.net>',
                  date='Thu,  3 Aug 2006 19:16:22 +0100',
                  )
     cl.add_change('');
@@ -138,7 +138,7 @@
                  version=Version('0.1-1'),
                  distributions='unstable',
                  urgency='low',
-                 author='James Westby <jw+debian at jameswestby.net',
+                 author='James Westby <jw+debian at jameswestby.net>',
                  date='Thu,  3 Aug 2006 19:16:22 +0100',
                  )
     cl.add_change('');
@@ -366,7 +366,7 @@
                  version=Version('0.1-1'),
                  distributions='unstable',
                  urgency='low',
-                 author='James Westby <jw+debian at jameswestby.net',
+                 author='James Westby <jw+debian at jameswestby.net>',
                  date='Thu,  3 Aug 2006 19:16:22 +0100',
                  )
     cl.add_change('');

=== modified file 'tests/test_util.py'
--- a/tests/test_util.py	2008-03-05 17:00:51 +0000
+++ b/tests/test_util.py	2008-07-11 21:45:33 +0000
@@ -69,6 +69,7 @@
     needed currently.
 
  -- James Westby <jw+debian at jameswestby.net>  Sun, 17 Jun 2007 18:48:28 +0100
+
 """
 
 
@@ -78,7 +79,7 @@
     f = open(filename, 'wb')
     try:
       f.write(cl_block1)
-      f.write(""" 
+      f.write("""\
 bzr-builddeb (0.16.2) unstable; urgency=low
 
   * loosen the dependency on bzr. bzr-builddeb seems to be not be broken