← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_repository/test_repository.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-24 16:09:47 UTC
  • mto: (5582.10.69 weave-fmt-plugin)
  • mto: This revision was merged to the branch mainline in revision 5688.
  • Revision ID: jelmer@samba.org-20110224160947-e7kqclxnjif28v5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_repository/test_repository.py
865
865
    def test_sprout_branch_from_hpss_preserves_repo_format(self):
866
866
        """branch.sprout from a smart server preserves the repository format.
867
867
        """
868
 
        weave_formats = [weaverepo.RepositoryFormat5(),
869
 
                         weaverepo.RepositoryFormat6(),
870
 
                         weaverepo.RepositoryFormat7()]
871
 
        if self.repository_format in weave_formats:
 
868
        if not self.repository_format.supports_leaving_lock:
872
869
            raise tests.TestNotApplicable(
873
 
                "Cannot fetch weaves over smart protocol.")
 
870
                "Format can not be used over HPSS")
874
871
        remote_repo = self.make_remote_repository('remote')
875
872
        remote_branch = remote_repo.bzrdir.create_branch()
876
873
        try:
887
884
        """branch.sprout from a smart server preserves the repository format of
888
885
        a branch from a shared repository.
889
886
        """
890
 
        weave_formats = [weaverepo.RepositoryFormat5(),
891
 
                         weaverepo.RepositoryFormat6(),
892
 
                         weaverepo.RepositoryFormat7()]
893
 
        if self.repository_format in weave_formats:
 
887
        if not self.repository_format.supports_leaving_lock:
894
888
            raise tests.TestNotApplicable(
895
 
                "Cannot fetch weaves over smart protocol.")
 
889
                "Format can not be used over HPSS")
896
890
        # Make a shared repo
897
891
        remote_repo = self.make_remote_repository('remote', shared=True)
898
892
        remote_backing_repo = bzrdir.BzrDir.open(
916
910
        self.assertEqual(remote_backing_repo._format, local_repo._format)
917
911
 
918
912
    def test_clone_to_hpss(self):
919
 
        pre_metadir_formats = [weaverepo.RepositoryFormat5(),
920
 
                               weaverepo.RepositoryFormat6()]
921
 
        if self.repository_format in pre_metadir_formats:
 
913
        if not self.repository_format.supports_leaving_lock:
922
914
            raise tests.TestNotApplicable(
923
915
                "Cannot lock pre_metadir_formats remotely.")
924
916
        remote_transport = self.make_smart_server('remote')
937
929
            repo = self.make_repository('repo', shared=True)
938
930
        except errors.IncompatibleFormat:
939
931
            raise tests.TestNotApplicable('Cannot make a shared repository')
940
 
        if isinstance(repo.bzrdir, bzrdir.BzrDirPreSplitOut):
 
932
        if repo.bzrdir._format.fixed_components:
941
933
            raise tests.KnownFailure(
942
934
                "pre metadir branches do not upgrade on push "
943
935
                "with stacking policy")
1347
1339
            'rev1', _mod_revision.NULL_REVISION, fileobj)
1348
1340
 
1349
1341
 
1350
 
 
1351
 
 
1352
1342
class TestRepositoryControlComponent(per_repository.TestCaseWithRepository):
1353
1343
    """Repository implementations adequately implement ControlComponent."""
1354
 
    
 
1344
 
1355
1345
    def test_urls(self):
1356
1346
        repo = self.make_repository('repo')
1357
1347
        self.assertIsInstance(repo.user_url, str)