← 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

  • Committer: Jelmer Vernooij
  • Date: 2011-03-11 14:02:28 UTC
  • mto: (5712.4.8 bzrdir-weave)
  • mto: This revision was merged to the branch mainline in revision 5716.
  • Revision ID: jelmer@samba.org-20110311140228-25jypsmdjk1gnx3i
Some more test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_controldir/test_controldir.py
906
906
        readonly_t = self.get_readonly_transport()
907
907
        made_control = self.bzrdir_format.initialize(t.base)
908
908
        self.failUnless(isinstance(made_control, controldir.ControlDir))
 
909
        if isinstance(self.bzrdir_format, RemoteBzrDirFormat):
 
910
            return
909
911
        self.assertEqual(self.bzrdir_format,
910
912
                         controldir.ControlDirFormat.find_format(readonly_t))
911
913
        direct_opened_dir = self.bzrdir_format.open(readonly_t)
1068
1070
        self.assertIsInstance(control, controldir.ControlDir)
1069
1071
        opened = bzrdir.BzrDir.open(t.base)
1070
1072
        expected_format = self.bzrdir_format
1071
 
        if isinstance(expected_format, RemoteBzrDirFormat):
1072
 
            # Current RemoteBzrDirFormat's do not reliably get network_name
1073
 
            # set, so we skip a number of tests for RemoteBzrDirFormat's.
1074
 
            self.assertIsInstance(control, RemoteBzrDir)
1075
 
        else:
1076
 
            if need_meta and expected_format.fixed_components:
1077
 
                # Pre-metadir formats change when we are making something that
1078
 
                # needs a metaformat, because clone is used for push.
1079
 
                expected_format = bzrdir.BzrDirMetaFormat1()
 
1073
        if need_meta and expected_format.fixed_components:
 
1074
            # Pre-metadir formats change when we are making something that
 
1075
            # needs a metaformat, because clone is used for push.
 
1076
            expected_format = bzrdir.BzrDirMetaFormat1()
 
1077
        if not isinstance(expected_format, RemoteBzrDirFormat):
1080
1078
            self.assertEqual(control._format.network_name(),
1081
1079
                expected_format.network_name())
1082
1080
            self.assertEqual(control._format.network_name(),