~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/bzrdir_implementations/test_bzrdir.py

MergeĀ fromĀ test-tweaks.

Show diffs side-by-side

added added

removed removed

Lines of Context:
732
732
        tree.bzrdir.open_repository().copy_content_into(source.repository)
733
733
        tree.bzrdir.open_branch().copy_content_into(source)
734
734
        dir = source.bzrdir
735
 
        target = dir.sprout(self.get_url('target'), revision_id='1')
 
735
        try:
 
736
            target_url = self.get_url('target')
 
737
            target = dir.sprout(target_url, revision_id='1')
 
738
        except errors.NotLocalUrl:
 
739
            raise TestSkipped("sprout cannot make working tree at %r"
 
740
                              % target_url)
736
741
        self.assertEqual('1', target.open_branch().last_revision())
737
742
        
738
743
    def test_sprout_bzrdir_tree_branch_repo(self):
741
746
        tree.add('foo')
742
747
        tree.commit('revision 1')
743
748
        dir = tree.bzrdir
744
 
        target = dir.sprout(self.get_url('target'))
 
749
        try:
 
750
            target_url = self.get_url('target')
 
751
            target = dir.sprout(target_url)
 
752
        except errors.NotLocalUrl:
 
753
            raise TestSkipped("sprout cannot make working tree at %r"
 
754
                              % target_url)
745
755
        self.assertNotEqual(dir.transport.base, target.transport.base)
746
756
        self.assertDirectoriesEqual(dir.root_transport, target.root_transport,
747
757
                                    ['./.bzr/stat-cache',
763
773
            # this is ok too, not all formats have to support references.
764
774
            return
765
775
        self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
766
 
        tree = dir.create_workingtree()
 
776
        try:
 
777
            tree = dir.create_workingtree()
 
778
        except errors.NotLocalUrl:
 
779
            raise TestSkipped("cannot make working tree with transport %r"
 
780
                              % dir.transport)
767
781
        tree.bzrdir.root_transport.mkdir('subdir')
768
782
        tree.add('subdir')
769
 
        target = dir.sprout(self.get_url('target'))
 
783
        try:
 
784
            target_url = self.get_url('target')
 
785
            target = dir.sprout(target_url)
 
786
        except (errors.NotLocalUrl, errors.NoWorkingTree):
 
787
            raise TestSkipped("sprout cannot make working tree at %r"
 
788
                              % target_url)
770
789
        self.assertNotEqual(dir.transport.base, target.transport.base)
771
790
        # we want target to have a branch that is in-place.
772
791
        self.assertEqual(target, target.open_branch().bzrdir)
789
808
            # this is ok too, not all formats have to support references.
790
809
            return
791
810
        self.assertRaises(errors.NoRepositoryPresent, dir.open_repository)
792
 
        tree = dir.create_workingtree()
 
811
        try:
 
812
            tree = dir.create_workingtree()
 
813
        except errors.NotLocalUrl:
 
814
            raise TestSkipped("cannot make working tree with transport %r"
 
815
                              % dir.transport)
793
816
        self.build_tree(['foo'], transport=dir.root_transport)
794
817
        tree.add('foo')
795
818
        tree.commit('revision 1', rev_id='1')
796
819
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
797
820
        target = dir.sprout(self.get_url('target'), revision_id='1')
 
821
        try:
 
822
            target.open_workingtree()
 
823
        except (errors.NotLocalUrl, errors.NoWorkingTree):
 
824
            raise TestSkipped("sprout cannot make working tree on transport %r"
 
825
                              % target.transport)
798
826
        self.assertNotEqual(dir.transport.base, target.transport.base)
799
827
        # we want target to have a branch that is in-place.
800
828
        self.assertEqual(target, target.open_branch().bzrdir)
817
845
        tree.commit('revision 1', rev_id='1')
818
846
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
819
847
        dir = tree.bzrdir
820
 
        target = dir.sprout(self.get_url('target'), revision_id='1')
 
848
        try:
 
849
            target_url = self.get_url('target')
 
850
            target = dir.sprout(target_url, revision_id='1')
 
851
        except errors.NotLocalUrl:
 
852
            raise TestSkipped("sprout cannot make working tree at %r"
 
853
                              % target_url)
821
854
        self.assertEqual('1', target.open_workingtree().last_revision())
822
855
 
823
856
    def test_sprout_bzrdir_incomplete_source_with_basis(self):