← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Robert Collins
  • Date: 2005-08-24 13:24:40 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050824132439-ee3be4a83bc3d6ad
move merge_core tests into the selftest package. Also reduce double-run of those tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
61
61
                   'bzrlib.selftest.testrevisionnamespaces',
62
62
                   'bzrlib.selftest.testbranch',
63
63
                   'bzrlib.selftest.testrevision',
64
 
                   'bzrlib.merge_core',
 
64
                   'bzrlib.selftest.test_merge_core',
65
65
                   'bzrlib.selftest.testdiff',
66
66
                   'bzrlib.fetch'
67
67
                   ]
83
83
    for p in bzrlib.plugin.all_plugins:
84
84
        if hasattr(p, 'test_suite'):
85
85
            suite.addTest(p.test_suite())
86
 
    import bzrlib.merge_core
87
 
    suite.addTest(unittest.makeSuite(bzrlib.merge_core.MergeTest, 'test_'))
88
86
    return suite
89
87