← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

(mbp) stop using failIf, failUnless, etc (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bzrdir.py
73
73
    def test_get_set_default_format(self):
74
74
        old_format = bzrdir.BzrDirFormat.get_default_format()
75
75
        # default is BzrDirMetaFormat1
76
 
        self.failUnless(isinstance(old_format, bzrdir.BzrDirMetaFormat1))
 
76
        self.assertIsInstance(old_format, bzrdir.BzrDirMetaFormat1)
77
77
        controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
78
78
        # creating a bzr dir should now create an instrumented dir.
79
79
        try:
80
80
            result = bzrdir.BzrDir.create('memory:///')
81
 
            self.failUnless(isinstance(result, SampleBzrDir))
 
81
            self.assertIsInstance(result, SampleBzrDir)
82
82
        finally:
83
83
            controldir.ControlDirFormat._set_default_format(old_format)
84
84
        self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
286
286
            format.initialize(url)
287
287
            t = _mod_transport.get_transport(url)
288
288
            found_format = bzrdir.BzrDirFormat.find_format(t)
289
 
            self.failUnless(isinstance(found_format, format.__class__))
 
289
            self.assertIsInstance(found_format, format.__class__)
290
290
        check_format(BzrDirFormatTest1(), "foo")
291
291
        check_format(BzrDirFormatTest2(), "bar")
292
292