← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

[merge] test renames and other fixes (John)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
31
31
import bzrlib.trace
32
32
import bzrlib.osutils as osutils
33
33
from bzrlib.trace import mutter
34
 
from bzrlib.selftest import TestUtil
35
 
from bzrlib.selftest.TestUtil import TestLoader, TestSuite
36
 
from bzrlib.selftest.treeshape import build_tree_contents
 
34
from bzrlib.tests.TestUtil import TestLoader, TestSuite
 
35
from bzrlib.tests.treeshape import build_tree_contents
37
36
from bzrlib.errors import BzrError
38
37
 
39
38
MODULES_TO_TEST = []
67
66
class _MyResult(unittest._TextTestResult):
68
67
    """Custom TestResult.
69
68
 
70
 
    No special behaviour for now.
 
69
    Shows output in a different format, including displaying runtime for tests.
71
70
    """
72
71
 
73
72
    # assumes 80-column window, less 'ERROR 99999ms' = 13ch
76
75
 
77
76
    def startTest(self, test):
78
77
        unittest.TestResult.startTest(self, test)
79
 
        # TODO: Maybe show test.shortDescription somewhere?
80
 
        what = test.shortDescription() or test.id()        
81
 
        pref = 'bzrlib.selftest.'
82
 
        if what.startswith(pref):
83
 
            what = what[len(pref):]
 
78
        # In a short description, the important words are in
 
79
        # the beginning, but in an id, the important words are
 
80
        # at the end
 
81
        SHOW_DESCRIPTIONS = False
 
82
        what = SHOW_DESCRIPTIONS and test.shortDescription()
 
83
        if what:
 
84
            if len(what) > 65:
 
85
                what = what[:62] + '...'
 
86
        else:
 
87
            what = test.id()
 
88
            if what.startswith('bzrlib.tests.'):
 
89
                what = what[13:]
 
90
            if len(what) > 65:
 
91
                what = '...' + what[-62:]
84
92
        if self.showAll:
85
93
            self.stream.write('%-65.65s' % what)
86
94
        self.stream.flush()
477
485
        super(TestCaseInTempDir, self).setUp()
478
486
        self._make_test_root()
479
487
        _currentdir = os.getcwdu()
480
 
        short_id = self.id().replace('bzrlib.selftest.', '') \
 
488
        short_id = self.id().replace('bzrlib.tests.', '') \
481
489
                   .replace('__main__.', '')
482
490
        self.test_dir = os.path.join(self.TEST_ROOT, short_id)
483
491
        os.mkdir(self.test_dir)
515
523
                f.close()
516
524
 
517
525
    def build_tree_contents(self, shape):
518
 
        bzrlib.selftest.build_tree_contents(shape)
 
526
        bzrlib.tests.build_tree_contents(shape)
519
527
 
520
528
    def failUnlessExists(self, path):
521
529
        """Fail unless path, which may be abs or relative, exists."""
588
596
    # exception is hidden by unittest.  Sucks.  Should either fix that or
589
597
    # perhaps import them and pass them to unittest as modules.
590
598
    testmod_names = \
591
 
                  ['bzrlib.selftest.MetaTestLog',
592
 
                   'bzrlib.selftest.testapi',
593
 
                   'bzrlib.selftest.testgpg',
594
 
                   'bzrlib.selftest.testidentitymap',
595
 
                   'bzrlib.selftest.testinv',
596
 
                   'bzrlib.selftest.test_ancestry',
597
 
                   'bzrlib.selftest.test_commit',
598
 
                   'bzrlib.selftest.test_command',
599
 
                   'bzrlib.selftest.test_commit_merge',
600
 
                   'bzrlib.selftest.testconfig',
601
 
                   'bzrlib.selftest.versioning',
602
 
                   'bzrlib.selftest.testmerge3',
603
 
                   'bzrlib.selftest.testmerge',
604
 
                   'bzrlib.selftest.testhashcache',
605
 
                   'bzrlib.selftest.teststatus',
606
 
                   'bzrlib.selftest.testlog',
607
 
                   'bzrlib.selftest.testrevisionnamespaces',
608
 
                   'bzrlib.selftest.testbranch',
609
 
                   'bzrlib.selftest.testrevision',
610
 
                   'bzrlib.selftest.test_revision_info',
611
 
                   'bzrlib.selftest.test_merge_core',
612
 
                   'bzrlib.selftest.test_smart_add',
613
 
                   'bzrlib.selftest.test_bad_files',
614
 
                   'bzrlib.selftest.testdiff',
615
 
                   'bzrlib.selftest.test_parent',
616
 
                   'bzrlib.selftest.test_xml',
617
 
                   'bzrlib.selftest.test_weave',
618
 
                   'bzrlib.selftest.testfetch',
619
 
                   'bzrlib.selftest.whitebox',
620
 
                   'bzrlib.selftest.teststore',
621
 
                   'bzrlib.selftest.blackbox',
622
 
                   'bzrlib.selftest.testsampler',
623
 
                   'bzrlib.selftest.testtransactions',
624
 
                   'bzrlib.selftest.testtransport',
625
 
                   'bzrlib.selftest.testsftp',
626
 
                   'bzrlib.selftest.testgraph',
627
 
                   'bzrlib.selftest.testworkingtree',
628
 
                   'bzrlib.selftest.test_upgrade',
629
 
                   'bzrlib.selftest.test_conflicts',
630
 
                   'bzrlib.selftest.testtestament',
631
 
                   'bzrlib.selftest.testannotate',
632
 
                   'bzrlib.selftest.testrevprops',
633
 
                   'bzrlib.selftest.testoptions',
634
 
                   'bzrlib.selftest.testhttp',
635
 
                   'bzrlib.selftest.testnonascii',
636
 
                   'bzrlib.selftest.testreweave',
637
 
                   'bzrlib.selftest.testtsort',
638
 
                   'bzrlib.selftest.testtrace',
639
 
                   'bzrlib.selftest.testbasicio',
 
599
                  ['bzrlib.tests.MetaTestLog',
 
600
                   'bzrlib.tests.test_api',
 
601
                   'bzrlib.tests.test_gpg',
 
602
                   'bzrlib.tests.test_identitymap',
 
603
                   'bzrlib.tests.test_inv',
 
604
                   'bzrlib.tests.test_ancestry',
 
605
                   'bzrlib.tests.test_commit',
 
606
                   'bzrlib.tests.test_command',
 
607
                   'bzrlib.tests.test_commit_merge',
 
608
                   'bzrlib.tests.test_config',
 
609
                   'bzrlib.tests.test_merge3',
 
610
                   'bzrlib.tests.test_merge',
 
611
                   'bzrlib.tests.test_hashcache',
 
612
                   'bzrlib.tests.test_status',
 
613
                   'bzrlib.tests.test_log',
 
614
                   'bzrlib.tests.test_revisionnamespaces',
 
615
                   'bzrlib.tests.test_branch',
 
616
                   'bzrlib.tests.test_revision',
 
617
                   'bzrlib.tests.test_revision_info',
 
618
                   'bzrlib.tests.test_merge_core',
 
619
                   'bzrlib.tests.test_smart_add',
 
620
                   'bzrlib.tests.test_bad_files',
 
621
                   'bzrlib.tests.test_diff',
 
622
                   'bzrlib.tests.test_parent',
 
623
                   'bzrlib.tests.test_xml',
 
624
                   'bzrlib.tests.test_weave',
 
625
                   'bzrlib.tests.test_fetch',
 
626
                   'bzrlib.tests.test_whitebox',
 
627
                   'bzrlib.tests.test_store',
 
628
                   'bzrlib.tests.blackbox',
 
629
                   'bzrlib.tests.blackbox.versioning',
 
630
                   'bzrlib.tests.test_sampler',
 
631
                   'bzrlib.tests.test_transactions',
 
632
                   'bzrlib.tests.test_transport',
 
633
                   'bzrlib.tests.test_sftp',
 
634
                   'bzrlib.tests.test_graph',
 
635
                   'bzrlib.tests.test_workingtree',
 
636
                   'bzrlib.tests.test_upgrade',
 
637
                   'bzrlib.tests.test_uncommit',
 
638
                   'bzrlib.tests.test_conflicts',
 
639
                   'bzrlib.tests.test_testament',
 
640
                   'bzrlib.tests.test_annotate',
 
641
                   'bzrlib.tests.test_revprops',
 
642
                   'bzrlib.tests.test_options',
 
643
                   'bzrlib.tests.test_http',
 
644
                   'bzrlib.tests.test_nonascii',
 
645
                   'bzrlib.tests.test_reweave',
 
646
                   'bzrlib.tests.test_tsort',
 
647
                   'bzrlib.tests.test_trace',
 
648
                   'bzrlib.tests.test_basicio',
640
649
                   ]
641
650
 
642
651
    for m in (bzrlib.store, bzrlib.inventory, bzrlib.branch,