Merge lp:~vila/bzr-builddeb/use-loader into lp:bzr-builddeb

[Vincent Ladeuil]

[Vincent Ladeuil (vila)]

This patch makes 'bzr selftest -s bp.builddeb' pass again.

It deletes the cmd_test_builddeb command since it's now replaced by the above command.

=== modified file 'cmds.py'
--- cmds.py	2009-12-01 17:14:15 +0000
+++ cmds.py	2010-01-29 09:34:14 +0000
@@ -52,7 +52,6 @@
     default_conf,
     local_conf,
     global_conf,
-    test_suite,
     )
 from bzrlib.plugins.builddeb.builder import (
                      DebBuild,
@@ -917,15 +916,3 @@
         else:
             note('The merge resulted in no conflicts. You may commit the '
             'changes by running "bzr commit".')
-
-
-class cmd_test_builddeb(Command):
-    """Run the builddeb test suite"""
-
-    hidden = True
-
-    def run(self):
-        from bzrlib.tests import selftest
-        passed = selftest(test_suite_factory=test_suite)
-        # invert for shell exit code rules
-        return not passed

=== modified file 'tests/__init__.py'
--- tests/__init__.py	2010-01-28 11:11:25 +0000
+++ tests/__init__.py	2010-01-29 09:34:14 +0000
@@ -28,10 +28,7 @@
 import os
 from unittest import TestSuite
 
-from bzrlib.lazy_import import lazy_import
-lazy_import(globals(), """
 from debian_bundle.changelog import Version, Changelog
-""")
 
 from bzrlib.tests import TestUtil, multiply_tests, TestCaseWithTransport