/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to tests/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-06 16:57:32 UTC
  • Revision ID: jelmer@samba.org-20111206165732-0i7lcllq42wy6tao
Cope with the fact that Option doesn't support the help argument in bzr 2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_commit.py
49
49
        tree = self.make_branch_and_tree('.')
50
50
        tree.commit('one')
51
51
 
 
52
        self.addCleanup(tree.lock_read().unlock)
52
53
        self.assertIs(None, commit.pending_revisions(tree))
53
54
 
54
55
    def test_pending_revisions_simple(self):
59
60
        tree.merge_from_branch(tree2.branch)
60
61
        self.assertEqual([rev_id1, rev_id2], tree.get_parent_ids())
61
62
 
 
63
        self.addCleanup(tree.lock_read().unlock)
62
64
        pending_revisions = commit.pending_revisions(tree)
63
65
        # One primary merge
64
66
        self.assertEqual(1, len(pending_revisions))
77
79
        tree.merge_from_branch(tree2.branch)
78
80
        self.assertEqual([rev_id1, rev_id4], tree.get_parent_ids())
79
81
 
 
82
        self.addCleanup(tree.lock_read().unlock)
80
83
        pending_revisions = commit.pending_revisions(tree)
81
84
        # One primary merge
82
85
        self.assertEqual(1, len(pending_revisions))
100
103
        tree.merge_from_branch(tree3.branch, force=True)
101
104
        self.assertEqual([rev_id1, rev_id3, rev_id5], tree.get_parent_ids())
102
105
 
 
106
        self.addCleanup(tree.lock_read().unlock)
103
107
        pending_revisions = commit.pending_revisions(tree)
104
108
        # Two primary merges
105
109
        self.assertEqual(2, len(pending_revisions))