← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1413
1413
                    t.mkdir('.')
1414
1414
                except errors.FileExists:
1415
1415
                    pass
1416
 
            if format is None:
 
1416
            if isinstance(format, basestring):
 
1417
                format = bzrdir.format_registry.make_bzrdir(format)
 
1418
            elif format is None:
1417
1419
                format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
1418
1420
            return format.initialize_on_transport(t)
1419
1421
        except errors.UninitializableFormat:
1743
1745
                   'bzrlib.tests.test_escaped_store',
1744
1746
                   'bzrlib.tests.test_fetch',
1745
1747
                   'bzrlib.tests.test_ftp_transport',
 
1748
                   'bzrlib.tests.test_generate_docs',
1746
1749
                   'bzrlib.tests.test_generate_ids',
1747
1750
                   'bzrlib.tests.test_globbing',
1748
1751
                   'bzrlib.tests.test_gpg',
1768
1771
                   'bzrlib.tests.test_nonascii',
1769
1772
                   'bzrlib.tests.test_options',
1770
1773
                   'bzrlib.tests.test_osutils',
 
1774
                   'bzrlib.tests.test_osutils_encodings',
1771
1775
                   'bzrlib.tests.test_patch',
1772
1776
                   'bzrlib.tests.test_patches',
1773
1777
                   'bzrlib.tests.test_permissions',