[Pkg-bazaar-commits] ./bzr/unstable r851: - run merge_core tests from bzr selftest

[Martin Pool]

------------------------------------------------------------
revno: 851
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Thu 2005-07-07 18:05:10 +1000
message:
  - run merge_core tests from bzr selftest
modified:
  bzrlib/selftest/__init__.py
-------------- next part --------------
=== modified file 'bzrlib/selftest/__init__.py'
--- a/bzrlib/selftest/__init__.py	2005-07-06 10:07:31 +0000
+++ b/bzrlib/selftest/__init__.py	2005-07-07 08:05:10 +0000
@@ -33,6 +33,7 @@
     import shutil
     import time
     import sys
+    import unittest
 
     TestBase.BZRPATH = os.path.join(os.path.realpath(os.path.dirname(bzrlib.__path__[0])), 'bzr')
     print '%-30s %s' % ('bzr binary', TestBase.BZRPATH)
@@ -62,6 +63,8 @@
                + bzrlib.selftest.blackbox.TEST_CLASSES):
         suite.addTest(cl())
 
+    suite.addTest(unittest.makeSuite(bzrlib.merge_core.MergeTest, 'test_'))
+
     return run_suite(suite, 'testbzr')