diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-06-12 18:07:58 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-06-12 18:09:06 -0400 |
| commit | bb440128bdf47cbec0789b1e9453ca726ad3dd50 (patch) | |
| tree | adf47cb7126d1ef28b907cf7a3450d37101f6ebf /pym/portage/tests | |
| parent | 84b1cdcf057576bf59d2f038609e8b32995f3231 (diff) | |
| download | portage-bb440128bdf47cbec0789b1e9453ca726ad3dd50.tar.gz portage-bb440128bdf47cbec0789b1e9453ca726ad3dd50.tar.bz2 portage-bb440128bdf47cbec0789b1e9453ca726ad3dd50.zip | |
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 <vapier@gentoo.org>
Diffstat (limited to 'pym/portage/tests')
| -rw-r--r-- | pym/portage/tests/repoman/test_echangelog.py | 9 |
1 files changed, 9 insertions, 0 deletions
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') |