/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_repository/test_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-03-03 02:28:57 UTC
  • mfrom: (5692 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5693.
  • Revision ID: jelmer@samba.org-20110303022857-pe8967n481mlengo
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_repository.py
873
873
    def test_sprout_branch_from_hpss_preserves_repo_format(self):
874
874
        """branch.sprout from a smart server preserves the repository format.
875
875
        """
876
 
        weave_formats = [weaverepo.RepositoryFormat5(),
877
 
                         weaverepo.RepositoryFormat6(),
878
 
                         weaverepo.RepositoryFormat7()]
879
 
        if self.repository_format in weave_formats:
 
876
        if not self.repository_format.supports_leaving_lock:
880
877
            raise tests.TestNotApplicable(
881
 
                "Cannot fetch weaves over smart protocol.")
 
878
                "Format can not be used over HPSS")
882
879
        remote_repo = self.make_remote_repository('remote')
883
880
        remote_branch = remote_repo.bzrdir.create_branch()
884
881
        try:
895
892
        """branch.sprout from a smart server preserves the repository format of
896
893
        a branch from a shared repository.
897
894
        """
898
 
        weave_formats = [weaverepo.RepositoryFormat5(),
899
 
                         weaverepo.RepositoryFormat6(),
900
 
                         weaverepo.RepositoryFormat7()]
901
 
        if self.repository_format in weave_formats:
 
895
        if not self.repository_format.supports_leaving_lock:
902
896
            raise tests.TestNotApplicable(
903
 
                "Cannot fetch weaves over smart protocol.")
 
897
                "Format can not be used over HPSS")
904
898
        # Make a shared repo
905
899
        remote_repo = self.make_remote_repository('remote', shared=True)
906
900
        remote_backing_repo = bzrdir.BzrDir.open(
924
918
        self.assertEqual(remote_backing_repo._format, local_repo._format)
925
919
 
926
920
    def test_clone_to_hpss(self):
927
 
        pre_metadir_formats = [weaverepo.RepositoryFormat5(),
928
 
                               weaverepo.RepositoryFormat6()]
929
 
        if self.repository_format in pre_metadir_formats:
 
921
        if not self.repository_format.supports_leaving_lock:
930
922
            raise tests.TestNotApplicable(
931
923
                "Cannot lock pre_metadir_formats remotely.")
932
924
        remote_transport = self.make_smart_server('remote')
945
937
            repo = self.make_repository('repo', shared=True)
946
938
        except errors.IncompatibleFormat:
947
939
            raise tests.TestNotApplicable('Cannot make a shared repository')
948
 
        if isinstance(repo.bzrdir, bzrdir.BzrDirPreSplitOut):
 
940
        if repo.bzrdir._format.fixed_components:
949
941
            raise tests.KnownFailure(
950
942
                "pre metadir branches do not upgrade on push "
951
943
                "with stacking policy")
1355
1347
            'rev1', _mod_revision.NULL_REVISION, fileobj)
1356
1348
 
1357
1349
 
1358
 
 
1359
 
 
1360
1350
class TestRepositoryControlComponent(per_repository.TestCaseWithRepository):
1361
1351
    """Repository implementations adequately implement ControlComponent."""
1362
 
    
 
1352
 
1363
1353
    def test_urls(self):
1364
1354
        repo = self.make_repository('repo')
1365
1355
        self.assertIsInstance(repo.user_url, str)