/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_controldir/test_controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-16 08:42:21 UTC
  • mfrom: (5777.6.11 commit-lossy)
  • mto: This revision was merged to the branch mainline in revision 5792.
  • Revision ID: jelmer@samba.org-20110416084221-g9kgp1j4o9zo0kk4
merge commit-lossy

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
122
122
            bzrdir.destroy_workingtree()
123
123
        except errors.UnsupportedOperation:
124
124
            raise TestSkipped('Format does not support destroying tree')
125
 
        self.failIfExists('tree/file')
 
125
        self.assertPathDoesNotExist('tree/file')
126
126
        self.assertRaises(errors.NoWorkingTree, bzrdir.open_workingtree)
127
127
        bzrdir.create_workingtree()
128
 
        self.failUnlessExists('tree/file')
 
128
        self.assertPathExists('tree/file')
129
129
        bzrdir.destroy_workingtree_metadata()
130
 
        self.failUnlessExists('tree/file')
 
130
        self.assertPathExists('tree/file')
131
131
        self.assertRaises(errors.NoWorkingTree, bzrdir.open_workingtree)
132
132
 
133
133
    def test_destroy_branch(self):
860
860
                create_tree_if_local=False)
861
861
        except errors.MustHaveWorkingTree:
862
862
            raise TestNotApplicable("control dir format requires working tree")
863
 
        self.failIfExists('target/foo')
 
863
        self.assertPathDoesNotExist('target/foo')
864
864
        self.assertEqual(tree.branch.last_revision(),
865
865
                         target.open_branch().last_revision())
866
866
 
905
905
        t = self.get_transport()
906
906
        readonly_t = self.get_readonly_transport()
907
907
        made_control = self.bzrdir_format.initialize(t.base)
908
 
        self.failUnless(isinstance(made_control, controldir.ControlDir))
 
908
        self.assertIsInstance(made_control, controldir.ControlDir)
909
909
        if isinstance(self.bzrdir_format, RemoteBzrDirFormat):
910
910
            return
911
911
        self.assertEqual(self.bzrdir_format,
916
916
                         opened_dir._format)
917
917
        self.assertEqual(direct_opened_dir._format,
918
918
                         opened_dir._format)
919
 
        self.failUnless(isinstance(opened_dir, controldir.ControlDir))
 
919
        self.assertIsInstance(opened_dir, controldir.ControlDir)
920
920
 
921
921
    def test_format_initialize_on_transport_ex(self):
922
922
        t = self.get_transport('dir')
1122
1122
        made_control = self.bzrdir_format.initialize(t.base)
1123
1123
        made_repo = made_control.create_repository()
1124
1124
        made_branch = made_control.create_branch()
1125
 
        self.failUnless(isinstance(made_branch, bzrlib.branch.Branch))
 
1125
        self.assertIsInstance(made_branch, bzrlib.branch.Branch)
1126
1126
        self.assertEqual(made_control, made_branch.bzrdir)
1127
1127
 
1128
1128
    def test_open_branch(self):
1137
1137
        made_branch = made_control.create_branch()
1138
1138
        opened_branch = made_control.open_branch()
1139
1139
        self.assertEqual(made_control, opened_branch.bzrdir)
1140
 
        self.failUnless(isinstance(opened_branch, made_branch.__class__))
1141
 
        self.failUnless(isinstance(opened_branch._format, made_branch._format.__class__))
 
1140
        self.assertIsInstance(opened_branch, made_branch.__class__)
 
1141
        self.assertIsInstance(opened_branch._format, made_branch._format.__class__)
1142
1142
 
1143
1143
    def test_list_branches(self):
1144
1144
        if not self.bzrdir_format.is_supported():
1215
1215
        made_repo = made_control.create_repository()
1216
1216
        opened_repo = made_control.open_repository()
1217
1217
        self.assertEqual(made_control, opened_repo.bzrdir)
1218
 
        self.failUnless(isinstance(opened_repo, made_repo.__class__))
1219
 
        self.failUnless(isinstance(opened_repo._format, made_repo._format.__class__))
 
1218
        self.assertIsInstance(opened_repo, made_repo.__class__)
 
1219
        self.assertIsInstance(opened_repo._format, made_repo._format.__class__)
1220
1220
 
1221
1221
    def test_create_workingtree(self):
1222
1222
        # a bzrdir can construct a working tree for itself.
1230
1230
        made_repo = made_control.create_repository()
1231
1231
        made_branch = made_control.create_branch()
1232
1232
        made_tree = self.createWorkingTreeOrSkip(made_control)
1233
 
        self.failUnless(isinstance(made_tree, workingtree.WorkingTree))
 
1233
        self.assertIsInstance(made_tree, workingtree.WorkingTree)
1234
1234
        self.assertEqual(made_control, made_tree.bzrdir)
1235
1235
 
1236
1236
    def test_create_workingtree_revision(self):
1269
1269
                              % (self.bzrdir_format, t))
1270
1270
        opened_tree = made_control.open_workingtree()
1271
1271
        self.assertEqual(made_control, opened_tree.bzrdir)
1272
 
        self.failUnless(isinstance(opened_tree, made_tree.__class__))
1273
 
        self.failUnless(isinstance(opened_tree._format, made_tree._format.__class__))
 
1272
        self.assertIsInstance(opened_tree, made_tree.__class__)
 
1273
        self.assertIsInstance(opened_tree._format, made_tree._format.__class__)
1274
1274
 
1275
1275
    def test_root_transport(self):
1276
1276
        dir = self.make_bzrdir('.')
1409
1409
        old_url, new_url = tree.bzrdir.backup_bzrdir()
1410
1410
        old_path = urlutils.local_path_from_url(old_url)
1411
1411
        new_path = urlutils.local_path_from_url(new_url)
1412
 
        self.failUnlessExists(old_path)
1413
 
        self.failUnlessExists(new_path)
 
1412
        self.assertPathExists(old_path)
 
1413
        self.assertPathExists(new_path)
1414
1414
        for (((dir_relpath1, _), entries1),
1415
1415
             ((dir_relpath2, _), entries2)) in izip(
1416
1416
                osutils.walkdirs(old_path),
1444
1444
    def test_format_description(self):
1445
1445
        dir = self.make_bzrdir('.')
1446
1446
        text = dir._format.get_format_description()
1447
 
        self.failUnless(len(text))
 
1447
        self.assertTrue(len(text))
1448
1448
 
1449
1449
 
1450
1450
class TestBreakLock(TestCaseWithControlDir):