/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/per_bzrdir/test_bzrdir.py

  • Committer: Neil Martinsen-Burrell
  • Date: 2011-05-19 01:42:12 UTC
  • mfrom: (5876 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5899.
  • Revision ID: nmb@wartburg.edu-20110519014212-d48xtqqeauq164al
merge bzr.dev, fix release notes conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
520
520
        # must not overwrite existing directories
521
521
        self.build_tree(['.bzr.retired.0/', '.bzr.retired.0/junk',],
522
522
            transport=transport)
523
 
        self.failUnless(transport.has('.bzr'))
 
523
        self.assertTrue(transport.has('.bzr'))
524
524
        bd.retire_bzrdir()
525
 
        self.failIf(transport.has('.bzr'))
526
 
        self.failUnless(transport.has('.bzr.retired.1'))
 
525
        self.assertFalse(transport.has('.bzr'))
 
526
        self.assertTrue(transport.has('.bzr.retired.1'))
527
527
 
528
528
    def test_retire_bzrdir_limited(self):
529
529
        bd = self.make_bzrdir('.')
531
531
        # must not overwrite existing directories
532
532
        self.build_tree(['.bzr.retired.0/', '.bzr.retired.0/junk',],
533
533
            transport=transport)
534
 
        self.failUnless(transport.has('.bzr'))
 
534
        self.assertTrue(transport.has('.bzr'))
535
535
        self.assertRaises((errors.FileExists, errors.DirectoryNotEmpty),
536
536
            bd.retire_bzrdir, limit=0)
537
537