← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_controldir/test_controldir.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
76
76
        """
77
77
        try:
78
78
            return a_bzrdir.create_workingtree()
79
 
        except errors.NotLocalUrl:
 
79
        except (errors.NotLocalUrl, errors.UnsupportedOperation):
80
80
            raise TestSkipped("cannot make working tree with transport %r"
81
81
                              % a_bzrdir.transport)
82
82
 
104
104
        dir.create_branch()
105
105
        try:
106
106
            wt = dir.create_workingtree(revision_id=bzrlib.revision.NULL_REVISION)
107
 
        except errors.NotLocalUrl:
 
107
        except (errors.NotLocalUrl, errors.UnsupportedOperation):
108
108
            raise TestSkipped("cannot make working tree with transport %r"
109
109
                              % dir.transport)
110
110
        self.assertEqual([], wt.get_parent_ids())
1006
1006
            registry = controldir.network_format_registry
1007
1007
            network_name = format.network_name()
1008
1008
            looked_up_format = registry.get(network_name)
1009
 
            self.assertEqual(format.__class__, looked_up_format.__class__)
 
1009
            self.assertTrue(
 
1010
                issubclass(format.__class__, looked_up_format.__class__))
1010
1011
        # The network name must be a byte string.
1011
1012
        self.assertIsInstance(network_name, str)
1012
1013
 
1151
1152
        source.branch.clone(made_control)
1152
1153
        try:
1153
1154
            made_tree = made_control.create_workingtree(revision_id='a')
1154
 
        except errors.NotLocalUrl:
 
1155
        except (errors.NotLocalUrl, errors.UnsupportedOperation):
1155
1156
            raise TestSkipped("Can't make working tree on transport %r" % t)
1156
1157
        self.assertEqual(['a'], made_tree.get_parent_ids())
1157
1158
 
1169
1170
            made_repo = made_control.create_repository()
1170
1171
            made_branch = made_control.create_branch()
1171
1172
            made_tree = made_control.create_workingtree()
1172
 
        except errors.NotLocalUrl:
 
1173
        except (errors.NotLocalUrl, errors.UnsupportedOperation):
1173
1174
            raise TestSkipped("Can't initialize %r on transport %r"
1174
1175
                              % (self.bzrdir_format, t))
1175
1176
        opened_tree = made_control.open_workingtree()