← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_move.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-10 07:46:15 UTC
  • mfrom: (5844 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5845.
  • Revision ID: jelmer@samba.org-20110510074615-eptod049ndjxc4i7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_move.py
24
24
    tests,
25
25
    )
26
26
 
27
 
from bzrlib.workingtree_4 import DirStateWorkingTreeFormat
28
27
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
29
28
 
30
29
 
174
173
                               ('b/c', 'c-id')], tree)
175
174
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
176
175
                               ('b/c', 'c-id')], tree.basis_tree())
177
 
        self.failIfExists('a')
 
176
        self.assertPathDoesNotExist('a')
178
177
        self.assertFileEqual(a_contents, 'b/a')
179
178
        tree._validate()
180
179
 
191
190
                               ('c', 'c-id')], tree)
192
191
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
193
192
                               ('b/c', 'c-id')], tree.basis_tree())
194
 
        self.failIfExists('b/c')
 
193
        self.assertPathDoesNotExist('b/c')
195
194
        self.assertFileEqual(c_contents, 'c')
196
195
        tree._validate()
197
196
 
210
209
            self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
211
210
                                   ('c', 'c-id')], tree)
212
211
        else:
213
 
            self.failUnlessExists('b/c')
 
212
            self.assertPathExists('b/c')
214
213
            self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),
215
214
                                   ('b/c', 'c-id')], tree)
216
215
        self.assertTreeLayout([('', root_id), ('a', 'a-id'), ('b', 'b-id'),