← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Merge previous attempt into current trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3567
3567
            randomize=None, exclude=None, strict=False,
3568
3568
            load_list=None, debugflag=None, starting_with=None, subunit=False,
3569
3569
            parallel=None, lsprof_tests=False):
3570
 
        from bzrlib.tests import selftest
3571
 
        import bzrlib.benchmarks as benchmarks
3572
 
        from bzrlib.benchmarks import tree_creator
 
3570
        from bzrlib import (
 
3571
            benchmarks,
 
3572
            tests,
 
3573
            )
3573
3574
 
3574
3575
        # Make deprecation warnings visible, unless -Werror is set
3575
3576
        symbol_versioning.activate_deprecation_warnings(override=False)
3576
3577
 
3577
3578
        if cache_dir is not None:
3578
 
            tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(cache_dir)
 
3579
            benchmarks.tree_creator.TreeCreator.CACHE_ROOT = osutils.abspath(
 
3580
                cache_dir)
3579
3581
        if testspecs_list is not None:
3580
3582
            pattern = '|'.join(testspecs_list)
3581
3583
        else:
3627
3629
                          "starting_with": starting_with
3628
3630
                          }
3629
3631
        selftest_kwargs.update(self.additional_selftest_args)
3630
 
        result = selftest(**selftest_kwargs)
 
3632
        result = tests.selftest(**selftest_kwargs)
3631
3633
        return int(not result)
3632
3634
 
3633
3635