← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-06 02:23:37 UTC
  • mfrom: (4332.3.36 check)
  • Revision ID: pqm@pqm.ubuntu.com-20090806022337-7c2oni07fsjq6gun
(robertc) Partial overhaul of check to do less duplicate work.
        (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
43
43
        self.assertContainsRe(output.getvalue(), 'empty commit')
44
44
 
45
45
    def make_multiple_pending_tree(self):
46
 
        self.thisFailsStrictLockCheck() # clone?
47
46
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
48
47
        tree = self.make_branch_and_tree('a')
49
48
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
100
99
 
101
100
    def test_pending_with_ghosts(self):
102
101
        """Test when a pending merge's ancestry includes ghosts."""
103
 
        self.thisFailsStrictLockCheck() # clone?
104
102
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
105
103
        tree = self.make_branch_and_tree('a')
106
104
        tree.commit('empty commit')