From bb440128bdf47cbec0789b1e9453ca726ad3dd50 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 12 Jun 2012 18:07:58 -0400 Subject: repoman: handle trailing newlines better Automatically strip trailing newlines from the ChangeLog, and be better about not adding them in the first place (still not perfect, but getting there). Signed-off-by: Mike Frysinger --- pym/portage/tests/repoman/test_echangelog.py | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'pym/portage/tests/repoman') diff --git a/pym/portage/tests/repoman/test_echangelog.py b/pym/portage/tests/repoman/test_echangelog.py index 71d6d5ebf..74aa1c54c 100644 --- a/pym/portage/tests/repoman/test_echangelog.py +++ b/pym/portage/tests/repoman/test_echangelog.py @@ -83,6 +83,7 @@ class RepomanEchangelogTestCase(TestCase): UpdateChangeLog(self.pkgdir, self.user, 'test!', self.skel_changelog, self.cat, self.pkg, quiet=True) actual_cl = self._readlines(self.changelog) self.assertEqual(actual_cl[0], self.header_pkg) + self.assertNotEqual(actual_cl[-1], '\n') def testExistingGoodHeader(self): # Test existing ChangeLog (correct values) @@ -99,3 +100,11 @@ class RepomanEchangelogTestCase(TestCase): UpdateChangeLog(self.pkgdir, self.user, 'test!', self.skel_changelog, self.cat, self.pkg, quiet=True) actual_cl = self._readlines(self.changelog) self.assertEqual(actual_cl[0], self.header_pkg) + + def testTrailingNewlines(self): + # Make sure trailing newlines get chomped. + self._writelines(self.changelog, ['#\n', 'foo\n', '\n', 'bar\n', '\n', '\n']) + + UpdateChangeLog(self.pkgdir, self.user, 'test!', self.skel_changelog, self.cat, self.pkg, quiet=True) + actual_cl = self._readlines(self.changelog) + self.assertNotEqual(actual_cl[-1], '\n') -- cgit v1.2.3-1-g7c22