← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/__init__.py

  • Committer: Martin Pool
  • Date: 2005-07-04 13:08:55 UTC
  • Revision ID: mbp@sourcefrog.net-20050704130854-7fbef398256b8cab
- start code for built-in diff3-style resolve

- test cases for this

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
214
214
    import bzrlib.selftest.whitebox
215
215
    import bzrlib.selftest.blackbox
216
216
    import bzrlib.selftest.versioning
 
217
    import bzrlib.selftest.merge3
217
218
    import bzrlib.merge_core
218
219
    from doctest import DocTestSuite
219
220
    import os
235
236
    # the code.
236
237
 
237
238
    for m in bzrlib.selftest.whitebox, \
238
 
            bzrlib.selftest.versioning:
 
239
            bzrlib.selftest.versioning, \
 
240
            bzrlib.selftest.merge3:
239
241
        suite.addTest(tl.loadTestsFromModule(m))
240
242
 
241
243
    for m in bzrlib.store, bzrlib.inventory, bzrlib.branch, bzrlib.osutils, \
242
 
            bzrlib.commands:
 
244
            bzrlib.commands, \
 
245
            bzrlib.merge3:
243
246
        suite.addTest(DocTestSuite(m))
244
247
 
245
248
    suite.addTest(bzrlib.selftest.blackbox.suite())