← 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
94
94
                          TestSuite,
95
95
                          TestLoader,
96
96
                          )
 
97
from bzrlib.tests.EncodingAdapter import EncodingTestAdapter
97
98
from bzrlib.tests.treeshape import build_tree_contents
98
99
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat2
99
100
 
2429
2430
                   'bzrlib.tests.test_lockable_files',
2430
2431
                   'bzrlib.tests.test_log',
2431
2432
                   'bzrlib.tests.test_lsprof',
 
2433
                   'bzrlib.tests.test_lru_cache',
2432
2434
                   'bzrlib.tests.test_mail_client',
2433
2435
                   'bzrlib.tests.test_memorytree',
2434
2436
                   'bzrlib.tests.test_merge',
2472
2474
                   'bzrlib.tests.test_store',
2473
2475
                   'bzrlib.tests.test_strace',
2474
2476
                   'bzrlib.tests.test_subsume',
 
2477
                   'bzrlib.tests.test_switch',
2475
2478
                   'bzrlib.tests.test_symbol_versioning',
2476
2479
                   'bzrlib.tests.test_tag',
2477
2480
                   'bzrlib.tests.test_testament',
2510
2513
    from bzrlib.tests.test_transport_implementations import TransportTestProviderAdapter
2511
2514
    adapter = TransportTestProviderAdapter()
2512
2515
    adapt_modules(test_transport_implementations, adapter, loader, suite)
 
2516
    adapt_tests(
 
2517
        ["bzrlib.tests.test_msgeditor.MsgEditorTest."
 
2518
         "test__create_temp_file_with_commit_template_in_unicode_dir"],
 
2519
        EncodingTestAdapter(), loader, suite)
2513
2520
    for package in packages_to_test():
2514
2521
        suite.addTest(package.test_suite())
2515
2522
    for m in MODULES_TO_TEST:
2601
2608
        suite.addTests(adapter.adapt(test))
2602
2609
 
2603
2610
 
 
2611
def adapt_tests(tests_list, adapter, loader, suite):
 
2612
    """Adapt the tests in tests_list using adapter and add to suite."""
 
2613
    for test in tests_list:
 
2614
        suite.addTests(adapter.adapt(loader.loadTestsFromName(test)))
 
2615
 
 
2616
 
2604
2617
def _rmtree_temp_dir(dirname):
2605
2618
    # If LANG=C we probably have created some bogus paths
2606
2619
    # which rmtree(unicode) will fail to delete