← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

[BROKEN] Many updates to stop using experimental formats in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
132
132
        default_factory = bzrdir.format_registry.get('default')
133
133
        old_default = [k for k, v in bzrdir.format_registry.iteritems()
134
134
                       if v == default_factory and k != 'default'][0]
135
 
        bzrdir.format_registry.set_default_repository('experimental-knit2')
 
135
        bzrdir.format_registry.set_default_repository('dirstate-with-subtree')
136
136
        try:
137
 
            self.assertIs(bzrdir.format_registry.get('experimental-knit2'),
 
137
            self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'),
138
138
                          bzrdir.format_registry.get('default'))
139
139
            self.assertIs(
140
140
                repository.RepositoryFormat.get_default_format().__class__,
141
 
                knitrepo.RepositoryFormatKnit2)
 
141
                knitrepo.RepositoryFormatKnit3)
142
142
        finally:
143
143
            bzrdir.format_registry.set_default_repository(old_default)
144
144
 
478
478
                          transport)
479
479
 
480
480
    def test_sprout_recursive(self):
481
 
        tree = self.make_branch_and_tree('tree1', format='experimental-reference-dirstate')
 
481
        tree = self.make_branch_and_tree('tree1', format='dirstate-with-subtree')
482
482
        sub_tree = self.make_branch_and_tree('tree1/subtree',
483
 
                                             format='experimental-reference-dirstate')
 
483
            format='dirstate-with-subtree')
484
484
        tree.add_reference(sub_tree)
485
485
        self.build_tree(['tree1/subtree/file'])
486
486
        sub_tree.add('file')
498
498
            workingtree.WorkingTreeFormat3)
499
499
 
500
500
    def test_sprout_recursive_treeless(self):
501
 
        tree = self.make_branch_and_tree('tree1', format='experimental-reference-dirstate')
 
501
        tree = self.make_branch_and_tree('tree1',
 
502
            format='dirstate-with-subtree')
502
503
        sub_tree = self.make_branch_and_tree('tree1/subtree',
503
 
                                             format='experimental-reference-dirstate')
 
504
            format='dirstate-with-subtree')
504
505
        tree.add_reference(sub_tree)
505
506
        self.build_tree(['tree1/subtree/file'])
506
507
        sub_tree.add('file')
507
508
        tree.commit('Initial commit')
508
509
        tree.bzrdir.destroy_workingtree()
509
510
        repo = self.make_repository('repo', shared=True,
510
 
                                    format='experimental-reference-dirstate')
 
511
            format='dirstate-with-subtree')
511
512
        repo.set_make_working_trees(False)
512
513
        tree.bzrdir.sprout('repo/tree2')
513
514
        self.failUnlessExists('repo/tree2/subtree')
551
552
        otherdir = bzrdir.format_registry.make_bzrdir('knit')
552
553
        self.assertEqual(otherdir, mydir)
553
554
        self.assertFalse(otherdir != mydir)
554
 
        otherdir2 = bzrdir.format_registry.make_bzrdir('experimental-knit2')
 
555
        otherdir2 = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
555
556
        self.assertNotEqual(otherdir2, mydir)
556
557
        self.assertFalse(otherdir2 == mydir)
557
558
 
745
746
    def test_checkout_metadir(self):
746
747
        # checkout_metadir has reasonable working tree format even when no
747
748
        # working tree is present
748
 
        self.make_branch('branch-knit2', format='experimental-knit2')
 
749
        self.make_branch('branch-knit2', format='dirstate-with-subtree')
749
750
        my_bzrdir = bzrdir.BzrDir.open(self.get_url('branch-knit2'))
750
751
        checkout_format = my_bzrdir.checkout_metadir()
751
752
        self.assertIsInstance(checkout_format.workingtree_format,