Merge lp:~gz/bzr-builddeb/trivial_tweak_utf8_changelog_test into lp:bzr-builddeb

[Martin Packman]

Different approach to fixing test as suggested by Jelmer. We can't use debian.changelog because we want to support multiple versions and there's an incompatible change in how it handles non-ascii contents. Instead, just write something that looks vaguely like a changelog to disk for the test.

[Jelmer Vernooij (jelmer)]

<jelmer_> mgz: still there
<jelmer_> mgz: ?
<jelmer_> mgz: With your patch, that test fails for me on oneiric
<jelmer_> mgz: I wonder if we should just open('debian/changelog', 'w').write("""...""") to make things simpler

[Jelmer Vernooij (jelmer)]

======================================================================
ERROR: bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_utf8_changelog
----------------------------------------------------------------------
_StringException: log: {{{
3.585 creating repository in file:///tmp/testbzr-p9_cJ_.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_utf8_changelog/work/.bzr/.
3.588 creating branch <bzrlib.branch.BzrBranchFormat7 object at 0x3d83790> in file:///tmp/testbzr-p9_cJ_.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_utf8_changelog/work/
3.597 trying to create missing lock '/tmp/testbzr-p9_cJ_.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_utf8_changelog/work/.bzr/checkout/dirstate'
3.598 opening working tree '/tmp/testbzr-p9_cJ_.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_utf8_changelog/work'
3.610 preparing to commit
    INFO Committing to: /tmp/testbzr-p9_cJ_.tmp/bzrlib.plugins.builddeb.tests.blackbox.test_builddeb.TestBuilddeb.test_utf8_changelog/work/
3.613 Selecting files for commit with filter None
    INFO added README
    INFO added debian
    INFO added debian/changelog
    INFO Committed revision 1.
3.624 Committed revid prerel as revno 1.
}}}

Traceback (most recent call last):
  File "/home/jelmer/src/bzr-builddeb/trunk/tests/blackbox/test_builddeb.py", line 189, in test_utf8_changelog
    self.write_changelog(c, "debian/changelog")
  File "/home/jelmer/src/bzr-builddeb/trunk/tests/__init__.py", line 216, in write_changelog
    changelog.write_to_open_file(f)
  File "/usr/lib/python2.7/dist-packages/debian/changelog.py", line 505, in write_to_open_file
    file.write(self.__str__())
  File "/usr/lib/python2.7/dist-packages/debian/changelog.py", line 470, in __str__
    return unicode(self).encode(self._encoding)
  File "/usr/lib/python2.7/dist-packages/debian/changelog.py", line 466, in __unicode__
    pieces.append(unicode(block))
UnicodeDecodeError: 'ascii' codec can't decode byte 0xe2 in position 57: ordinal not in range(128)

----------------------------------------------------------------------

[Martin Packman (gz)]

Thanks for testing that Jelmer. Annoying, by fiddling across different versions debian.changelog can't reliably be used with non-ascii contents. I'll look at just splatting some bytes as you suggest.

[Martin Packman (gz)]

Whoops, push had remembered the wrong place, ignore this mp.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'tests/blackbox/test_builddeb.py'
--- tests/blackbox/test_builddeb.py	2011-10-01 20:41:14 +0000
+++ tests/blackbox/test_builddeb.py	2011-10-12 16:45:28 +0000
@@ -183,13 +183,16 @@
     # is then changed, so need to clear it, commit, then set the contents.
     open("debian/changelog", "w").close()
     tree.commit("Prepare for release", rev_id="prerel")
-    c = self.make_changelog()
-    c.add_change(u"")
-    c.add_change(u"  *  \u2026and another thing")
-    self.write_changelog(c, "debian/changelog")
+    # Would be nice to use debian.changelog to make one, but it's changed
+    # across versions as to how it wants non-ascii bytes provided.
+    f = open("debian/changelog", "w")
+    try:
+      f.write("  * \xe2\x80\xa6and another thing")
+    finally:
+      f.close()
     self.run_bzr(['commit'])
     branch = tree.branch
-    self.assertEqual(u"*  test build\n*  \u2026and another thing\n",
+    self.assertEqual(u"\u2026and another thing",
       branch.repository.get_revision(branch.last_revision()).message)
 
 # vim: ts=2 sts=2 sw=2