~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit.py

  • Committer: Lukáš Lalinský
  • Date: 2007-08-08 05:43:43 UTC
  • mto: (2755.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 2709.
  • Revision ID: lalinsky@gmail.com-20070808054343-598cls6ybso02utp
Nuke test_commit_author_conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
714
714
        rev = tree.branch.repository.get_revision(rev_id)
715
715
        self.assertEqual('John Doe <jdoe@example.com>',
716
716
                         rev.properties['author'])
717
 
 
718
 
    def test_commit_author_conflict(self):
719
 
        """Passing both author kwarg and 'author' key in revprops should
720
 
        raise AssertionError.
721
 
        """
722
 
        tree = self.make_branch_and_tree('foo')
723
 
        self.assertRaises(AssertionError, tree.commit, 'commit 1',
724
 
                          author='John Doe <jdoe@example.com>',
725
 
                          revprops={'author': ''})