/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_transform.py

(mbp) stop using failIf, failUnless, etc (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1259
1259
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
1260
1260
        # rename limbo/new-1 => parent1, rename limbo/new-3 => parent2
1261
1261
        # no rename for child1 (counting only renames during apply)
1262
 
        self.failUnlessEqual(2, transform.rename_count)
 
1262
        self.assertEqual(2, transform.rename_count)
1263
1263
 
1264
1264
    def test_cancel_parent(self):
1265
1265
        """Cancelling a parent doesn't cause deletion of a non-empty directory
1291
1291
        self.failIfExists(self.wt.abspath('parent1'))
1292
1292
        self.failUnlessExists(self.wt.abspath('parent2/child1'))
1293
1293
        # rename limbo/new-3 => parent2, rename limbo/new-2 => child1
1294
 
        self.failUnlessEqual(2, transform.rename_count)
 
1294
        self.assertEqual(2, transform.rename_count)
1295
1295
 
1296
1296
    def test_adjust_and_cancel(self):
1297
1297
        """Make sure adjust_path keeps track of limbo children properly"""