← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Robert Collins
  • Date: 2009-08-24 05:35:28 UTC
  • mto: This revision was merged to the branch mainline in revision 4640.
  • Revision ID: robertc@robertcollins.net-20090824053528-bx777wav5pt4ltmo
Minor tweaks to clarity in slower selftest tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
1747
1747
 
1748
1748
    def test_make_tree_for_sftp_branch(self):
1749
1749
        """Transports backed by local directories create local trees."""
1750
 
 
 
1750
        # NB: This is arguably a bug in the definition of make_branch_and_tree.
1751
1751
        tree = self.make_branch_and_tree('t1')
1752
1752
        base = tree.bzrdir.root_transport.base
1753
1753
        self.failIf(base.startswith('sftp'),
2364
2364
        tests.TestCase.setUp(self)
2365
2365
        self.suite = TestUtil.TestSuite()
2366
2366
        self.loader = TestUtil.TestLoader()
2367
 
        self.suite.addTest(self.loader.loadTestsFromModuleNames([
2368
 
            'bzrlib.tests.test_selftest']))
 
2367
        self.suite.addTest(self.loader.loadTestsFromModule(
 
2368
            sys.modules['bzrlib.tests.test_selftest']))
2369
2369
        self.all_names = _test_ids(self.suite)
2370
2370
 
2371
2371
    def test_condition_id_re(self):
2682
2682
class TestTestSuite(tests.TestCase):
2683
2683
 
2684
2684
    def test_test_suite(self):
2685
 
        # This test is slow, so we do a single test with one test in each
2686
 
        # category
 
2685
        # This test is slow - it loads the entire test suite to operate, so we
 
2686
        # do a single test with one test in each category
2687
2687
        test_list = [
2688
2688
            # testmod_names
2689
2689
            'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
2699
2699
        self.assertEquals(test_list, _test_ids(suite))
2700
2700
 
2701
2701
    def test_test_suite_list_and_start(self):
 
2702
        # We cannot test this at the same time as the main load, because we want
 
2703
        # to know that starting_with == None works. So a second full load is
 
2704
        # incurred.
2702
2705
        test_list = ['bzrlib.tests.test_selftest.TestTestSuite.test_test_suite']
2703
2706
        suite = tests.test_suite(test_list,
2704
2707
                                 ['bzrlib.tests.test_selftest.TestTestSuite'])