~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

Merge pt1 hooks branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2504
2504
                self.addCleanup(t.disconnect)
2505
2505
            return t
2506
2506
 
2507
 
        orig_get_transport = self.overrideAttr(_mod_transport, '_get_transport',
 
2507
        orig_get_transport = self.overrideAttr(_mod_transport, 'get_transport',
2508
2508
                                               get_transport_with_cleanup)
2509
2509
        self._make_test_root()
2510
2510
        self.addCleanup(os.chdir, os.getcwdu())
3802
3802
        'bzrlib.tests.test_merge3',
3803
3803
        'bzrlib.tests.test_merge_core',
3804
3804
        'bzrlib.tests.test_merge_directive',
 
3805
        'bzrlib.tests.test_mergetools',
3805
3806
        'bzrlib.tests.test_missing',
3806
3807
        'bzrlib.tests.test_msgeditor',
3807
3808
        'bzrlib.tests.test_multiparent',
3857
3858
        'bzrlib.tests.test_testament',
3858
3859
        'bzrlib.tests.test_textfile',
3859
3860
        'bzrlib.tests.test_textmerge',
 
3861
        'bzrlib.tests.test_cethread',
3860
3862
        'bzrlib.tests.test_timestamp',
3861
3863
        'bzrlib.tests.test_trace',
3862
3864
        'bzrlib.tests.test_transactions',