Merge lp:~dobey/tarmac/broken-author into lp:tarmac

[dobey]

Handle an AssertionError from bzrlib on commit, and add a test for it.

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'tarmac/branch.py'
--- tarmac/branch.py	2013-10-31 18:32:39 +0000
+++ tarmac/branch.py	2013-11-04 17:53:52 +0000
@@ -154,8 +154,11 @@
                                            'review identity or vote.')
             revprops['reviews'] = '\n'.join(reviews)
 
-        self.tree.commit(commit_message, committer='Tarmac',
-                         revprops=revprops, authors=authors)
+        try:
+            self.tree.commit(commit_message, committer='Tarmac',
+                             revprops=revprops, authors=authors)
+        except AssertionError as error:
+            raise TarmacMergeError(str(error))
 
     @property
     def landing_candidates(self):

=== modified file 'tarmac/tests/test_branch.py'
--- tarmac/tests/test_branch.py	2013-10-31 22:02:47 +0000
+++ tarmac/tests/test_branch.py	2013-11-04 17:53:52 +0000
@@ -21,8 +21,11 @@
 from bzrlib.errors import PointlessMerge
 
 from tarmac import branch
-from tarmac.tests import BranchTestCase
-from tarmac.tests import MockLPBranch
+from tarmac.exceptions import TarmacMergeError
+from tarmac.tests import (
+    BranchTestCase,
+    MockLPBranch,
+)
 
 
 class TestBranch(BranchTestCase):
@@ -199,3 +202,10 @@
         self.assertEqual(sorted(self.branch1.unmanaged_files), expected)
         self.branch1.cleanup()
         self.assertEqual(self.branch1.unmanaged_files, [])
+
+    def test_commit_with_author_with_newline(self):
+        """Test that committing a branch with an author containing \n fails."""
+        authors = ['author1', 'author2']
+        self.assertRaises(TarmacMergeError,
+                          self.branch2.commit,
+                          'Authors Merge test', authors=['\n'.join(authors)])