← 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: 2010-03-10 09:33:04 UTC
  • mto: (5082.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5083.
  • Revision ID: v.ladeuil+lp@free.fr-20100310093304-4245t4tazd4sxoav
Cleanup test from overly cautious checks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_commit.py
1
 
# Copyright (C) 2007-2010, 2016 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(message=u'empty commit', unchanged=True)
46
 
        self.assertEqual(1, len(self.connections))
 
45
        commit.run_direct(message=u'empty commit', unchanged=True)
 
46
        self.assertEquals(1, len(self.connections))
47
47
 
48
48
    def test_commit_both_modified(self):
49
49
        self.master_wt.commit('empty commit on master')
55
55
        os.chdir('local')
56
56
        self.assertRaises(errors.BoundBranchOutOfDate, commit.run,
57
57
                          message=u'empty commit', unchanged=True)
58
 
        self.assertEqual(1, len(self.connections))
 
58
        self.assertEquals(1, len(self.connections))
59
59
 
60
60
    def test_commit_local(self):
61
61
        """Commits with --local should not connect to the master!"""
68
68
        commit.run(message=u'empty commit', unchanged=True, local=True)
69
69
 
70
70
        #it shouldn't open any connections
71
 
        self.assertEqual(0, len(self.connections))
 
71
        self.assertEquals(0, len(self.connections))