[Pkg-bazaar-commits] ./bzr/unstable r809: - stubbed out call to merge_core tests

[Martin Pool]

------------------------------------------------------------
revno: 809
committer: Martin Pool <mbp at sourcefrog.net>
timestamp: Mon 2005-07-04 15:29:56 +1000
message:
  - stubbed out call to merge_core tests
modified:
  bzrlib/selftest/__init__.py
-------------- next part --------------
=== modified file 'bzrlib/selftest/__init__.py'
--- a/bzrlib/selftest/__init__.py	2005-06-28 03:02:31 +0000
+++ b/bzrlib/selftest/__init__.py	2005-07-04 05:29:56 +0000
@@ -214,6 +214,7 @@
     import bzrlib.selftest.whitebox
     import bzrlib.selftest.blackbox
     import bzrlib.selftest.versioning
+    import bzrlib.merge_core
     from doctest import DocTestSuite
     import os
     import shutil
@@ -230,6 +231,9 @@
     suite = TestSuite()
     tl = TestLoader()
 
+    # should also test bzrlib.merge_core, but they seem to be out of date with
+    # the code.
+
     for m in bzrlib.selftest.whitebox, \
             bzrlib.selftest.versioning:
         suite.addTest(tl.loadTestsFromModule(m))