← Back to branch summary

~bzr/ubuntu/lucid/bzr/beta-ppa

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-08-18 04:26:39 UTC
  • mfrom: (129.1.8 packaging-karmic)
  • Revision ID: mbp@sourcefrog.net-20100818042639-mjoxtngyjwiu05fo
* PPA rebuild for lucid.
* PPA rebuild for karmic.
* PPA rebuild onto jaunty.
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_remove.py
278
278
        self.assertRemovedAndDeleted(files)
279
279
        tree._validate()
280
280
 
 
281
    def test_remove_directory_with_changed_emigrated_file(self):
 
282
        # As per bug #129880
 
283
        tree = self.make_branch_and_tree('.')
 
284
        self.build_tree_contents([('somedir/',), ('somedir/file', 'contents')])
 
285
        tree.add(['somedir', 'somedir/file'])
 
286
        tree.commit(message="first")
 
287
        self.build_tree_contents([('somedir/file', 'changed')])
 
288
        tree.rename_one('somedir/file', 'moved-file')
 
289
        tree.remove('somedir', keep_files=False)
 
290
        self.assertNotInWorkingTree('somedir')
 
291
        self.failIfExists('somedir')
 
292
        self.assertInWorkingTree('moved-file')
 
293
        self.failUnlessExists('moved-file')
 
294
 
281
295
    def test_remove_directory_with_renames(self):
282
296
        """Delete directory with renames in or out."""
283
297