← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_commit.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 10:30:11 UTC
  • mto: This revision was merged to the branch mainline in revision 6611.
  • Revision ID: v.ladeuil+lp@free.fr-20160121103011-92a8bf7a9euu3i10
https://launchpad.net/bugs/1536566
Fix test failure encountered with recent versions of gpg[me]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_commit.py
42
42
        # commit do not provide a directory parameter, we have to change dir
43
43
        # manually
44
44
        os.chdir('local')
45
 
        commit.run_direct(message=u'empty commit', unchanged=True)
 
45
        commit.run(message=u'empty commit', unchanged=True)
46
46
        self.assertEquals(1, len(self.connections))
47
47
 
48
48
    def test_commit_both_modified(self):
53
53
        # commit do not provide a directory parameter, we have to change dir
54
54
        # manually
55
55
        os.chdir('local')
56
 
        # cmd_commit translates BoundBranchOutOfDate into BzrCommandError
57
 
        self.assertRaises(errors.BzrCommandError, commit.run,
 
56
        self.assertRaises(errors.BoundBranchOutOfDate, commit.run,
58
57
                          message=u'empty commit', unchanged=True)
59
58
        self.assertEquals(1, len(self.connections))
60
59