← 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: Canonical.com Patch Queue Manager
  • Date: 2010-09-01 08:02:42 UTC
  • mfrom: (5390.3.3 faster-revert-593560)
  • Revision ID: pqm@pqm.ubuntu.com-20100901080242-esg62ody4frwmy66
(spiv) Avoid repeatedly calling self.target.all_file_ids() in
 InterTree.iter_changes. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_commit.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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