/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: John Arbash Meinel
  • Date: 2009-07-31 17:42:29 UTC
  • mto: This revision was merged to the branch mainline in revision 4611.
  • Revision ID: john@arbash-meinel.com-20090731174229-w2zdsdlfpeddk8gl
Now we got to the per-workingtree tests, etc.

The main causes seem to break down into:
  bzrdir.clone() is known to be broken wrt locking, this effects
  everything that tries to 'push'

  shelf code is not compatible with strict locking

  merge code seems to have an issue. This might actually be the
  root cause of the clone() problems.

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?
46
47
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
47
48
        tree = self.make_branch_and_tree('a')
48
49
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
99
100
 
100
101
    def test_pending_with_ghosts(self):
101
102
        """Test when a pending merge's ancestry includes ghosts."""
 
103
        self.thisFailsStrictLockCheck() # clone?
102
104
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
103
105
        tree = self.make_branch_and_tree('a')
104
106
        tree.commit('empty commit')