/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

  • Committer: Aaron Bentley
  • Date: 2007-02-16 07:02:19 UTC
  • mfrom: (2292 +trunk)
  • mto: (2255.6.1 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070216070219-b22k0gwnisnxawnk
Merged bzr.dev (17 tests failing)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1426
1426
                    t.mkdir('.')
1427
1427
                except errors.FileExists:
1428
1428
                    pass
 
1429
            if format is None:
 
1430
                format = 'default'
1429
1431
            if isinstance(format, basestring):
1430
1432
                format = bzrdir.format_registry.make_bzrdir(format)
1431
 
            elif format is None:
1432
 
                format = bzrlib.bzrdir.BzrDirFormat.get_default_format()
1433
1433
            return format.initialize_on_transport(t)
1434
1434
        except errors.UninitializableFormat:
1435
1435
            raise TestSkipped("Format %s is not initializable." % format)
1875
1875
            raise
1876
1876
    for name, plugin in bzrlib.plugin.all_plugins().items():
1877
1877
        if getattr(plugin, 'test_suite', None) is not None:
1878
 
            suite.addTest(plugin.test_suite())
 
1878
            default_encoding = sys.getdefaultencoding()
 
1879
            try:
 
1880
                plugin_suite = plugin.test_suite()
 
1881
            except ImportError, e:
 
1882
                bzrlib.trace.warning(
 
1883
                    'Unable to test plugin "%s": %s', name, e)
 
1884
            else:
 
1885
                suite.addTest(plugin_suite)
 
1886
            if default_encoding != sys.getdefaultencoding():
 
1887
                bzrlib.trace.warning(
 
1888
                    'Plugin "%s" tried to reset default encoding to: %s', name,
 
1889
                    sys.getdefaultencoding())
 
1890
                reload(sys)
 
1891
                sys.setdefaultencoding(default_encoding)
1879
1892
    return suite
1880
1893
 
1881
1894