← 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-07 08:05:10 UTC
  • Revision ID: mbp@sourcefrog.net-20050707080510-e4abca8d15db45f7
- run merge_core tests from bzr selftest

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/__init__.py
33
33
    import shutil
34
34
    import time
35
35
    import sys
 
36
    import unittest
36
37
 
37
38
    TestBase.BZRPATH = os.path.join(os.path.realpath(os.path.dirname(bzrlib.__path__[0])), 'bzr')
38
39
    print '%-30s %s' % ('bzr binary', TestBase.BZRPATH)
62
63
               + bzrlib.selftest.blackbox.TEST_CLASSES):
63
64
        suite.addTest(cl())
64
65
 
 
66
    suite.addTest(unittest.makeSuite(bzrlib.merge_core.MergeTest, 'test_'))
 
67
 
65
68
    return run_suite(suite, 'testbzr')
66
69
 
67
70