← Back to branch summary

~ubuntu-branches/ubuntu/karmic/bzr/karmic-proposed

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2008-05-12 00:14:54 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20080512001454-yjpajuiocykl48p9
Tags: 1.5~rc1-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
65
65
                          iter_suite_tests,
66
66
                          preserve_input,
67
67
                          randomize_suite,
68
 
                          sort_suite_by_re,
69
68
                          split_suite_by_re,
70
69
                          test_lsprof,
71
70
                          test_suite,
502
501
        adapter = TreeTestProviderAdapter(server1, server2, formats)
503
502
        suite = adapter.adapt(input_test)
504
503
        tests = list(iter(suite))
505
 
        self.assertEqual(4, len(tests))
 
504
        # XXX We should not have tests fail as we add more scenarios
 
505
        # abentley 20080412
 
506
        self.assertEqual(5, len(tests))
506
507
        # this must match the default format setp up in
507
508
        # TreeTestProviderAdapter.adapt
508
509
        default_format = WorkingTreeFormat3
510
511
        self.assertEqual(tests[0].bzrdir_format, formats[0][1])
511
512
        self.assertEqual(tests[0].transport_server, server1)
512
513
        self.assertEqual(tests[0].transport_readonly_server, server2)
513
 
        self.assertEqual(tests[0].workingtree_to_test_tree, return_parameter)
 
514
        self.assertEqual(tests[0]._workingtree_to_test_tree, return_parameter)
514
515
        self.assertEqual(tests[1].workingtree_format, formats[1][0])
515
516
        self.assertEqual(tests[1].bzrdir_format, formats[1][1])
516
517
        self.assertEqual(tests[1].transport_server, server1)
517
518
        self.assertEqual(tests[1].transport_readonly_server, server2)
518
 
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
 
519
        self.assertEqual(tests[1]._workingtree_to_test_tree, return_parameter)
519
520
        self.assertIsInstance(tests[2].workingtree_format, default_format)
520
521
        #self.assertEqual(tests[2].bzrdir_format,
521
522
        #                 default_format._matchingbzrdir)
522
523
        self.assertEqual(tests[2].transport_server, server1)
523
524
        self.assertEqual(tests[2].transport_readonly_server, server2)
524
 
        self.assertEqual(tests[2].workingtree_to_test_tree,
 
525
        self.assertEqual(tests[2]._workingtree_to_test_tree,
525
526
            revision_tree_from_workingtree)
526
527
 
527
528
 
562
563
        self.assertEqual(tests[0].workingtree_format, formats[0][1])
563
564
        self.assertEqual(tests[0].workingtree_format_to, formats[0][2])
564
565
        self.assertEqual(tests[0].mutable_trees_to_test_trees, formats[0][3])
565
 
        self.assertEqual(tests[0].workingtree_to_test_tree, return_parameter)
 
566
        self.assertEqual(tests[0]._workingtree_to_test_tree, return_parameter)
566
567
        self.assertEqual(tests[0].transport_server, server1)
567
568
        self.assertEqual(tests[0].transport_readonly_server, server2)
568
569
        self.assertEqual(tests[1].intertree_class, formats[1][0])
569
570
        self.assertEqual(tests[1].workingtree_format, formats[1][1])
570
571
        self.assertEqual(tests[1].workingtree_format_to, formats[1][2])
571
572
        self.assertEqual(tests[1].mutable_trees_to_test_trees, formats[1][3])
572
 
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
 
573
        self.assertEqual(tests[1]._workingtree_to_test_tree, return_parameter)
573
574
        self.assertEqual(tests[1].transport_server, server1)
574
575
        self.assertEqual(tests[1].transport_readonly_server, server2)
575
576
 
1822
1823
        # necessarily.)
1823
1824
        self.assertEqual(len(self.all_names), len(_test_ids(randomized_suite)))
1824
1825
 
1825
 
    def test_sort_suite_by_re(self):
1826
 
        sorted_suite = self.applyDeprecated(one_zero,
1827
 
            sort_suite_by_re, self.suite, 'test_filter_suite_by_r')
1828
 
        sorted_names = _test_ids(sorted_suite)
1829
 
        self.assertEqual(sorted_names[0], 'bzrlib.tests.test_selftest.'
1830
 
            'TestSelftestFiltering.test_filter_suite_by_re')
1831
 
        self.assertEquals(sorted(self.all_names), sorted(sorted_names))
1832
 
 
1833
1826
    def test_split_suit_by_re(self):
1834
1827
        self.all_names = _test_ids(self.suite)
1835
1828
        split_suite = split_suite_by_re(self.suite, 'test_filter_suite_by_r')
1987
1980
        # category
1988
1981
        test_list = [
1989
1982
            # testmod_names
 
1983
            'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
1990
1984
            'bzrlib.tests.test_selftest.TestTestIdList.test_test_suite',
1991
1985
            # transport implementations
1992
1986
            'bzrlib.tests.test_transport_implementations.TransportTests'
1993
1987
            '.test_abspath(LocalURLServer)',
1994
 
            # packages_to_test()
1995
 
            'bzrlib.tests.blackbox.test_branch.TestBranch.test_branch',
1996
 
            # MODULES_TO_DOCTEST
 
1988
            # modules_to_doctest
1997
1989
            'bzrlib.timestamp.format_highres_date',
1998
1990
            # plugins can't be tested that way since selftest may be run with
1999
1991
            # --no-plugins