/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: 2012-01-02 14:27:58 UTC
  • mfrom: (6410 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6441.
  • Revision ID: jelmer@samba.org-20120102142758-hl7xrn7m5hjhecdv
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
156
156
        except (errors.UnsupportedOperation, errors.TransportNotPossible):
157
157
            raise TestNotApplicable('Format does not support destroying'
158
158
                                    ' repository')
 
159
        self.assertRaises(errors.NoRepositoryPresent,
 
160
            bzrdir.destroy_repository)
159
161
        self.assertRaises(errors.NoRepositoryPresent, bzrdir.open_repository)
160
162
        bzrdir.create_repository()
161
163
        bzrdir.open_repository()
744
746
            source.tags.set_tag('tag-a', 'rev-2')
745
747
        except errors.TagsNotSupported:
746
748
            raise TestNotApplicable('Branch format does not support tags.')
747
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
749
        source.get_config_stack().set('branch.fetch_tags', True)
748
750
        # Now source has a tag not in its ancestry.  Sprout its controldir.
749
751
        dir = source.bzrdir
750
752
        target = dir.sprout(self.get_url('target'))
823
825
            has_ghost_tag = False
824
826
        else:
825
827
            has_ghost_tag = True
826
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
828
        source.get_config_stack().set('branch.fetch_tags', True)
827
829
        # And ask sprout for C2
828
830
        dir = source.bzrdir
829
831
        target = dir.sprout(self.get_url('target'), revision_id='rev-c2')
1190
1192
        else:
1191
1193
            self.assertEquals([], made_control.list_branches())
1192
1194
 
 
1195
    def test_get_branches(self):
 
1196
        repo = self.make_repository('branch-1')
 
1197
        target_branch = repo.bzrdir.create_branch()
 
1198
        self.assertEqual([None], repo.bzrdir.get_branches().keys())
 
1199
 
1193
1200
    def test_create_repository(self):
1194
1201
        # a bzrdir can construct a repository for itself.
1195
1202
        if not self.bzrdir_format.is_initializable():