← 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: Aaron Bentley
  • Date: 2008-04-24 04:58:42 UTC
  • mfrom: (3377 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3380.
  • Revision ID: aaron@aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
510
510
        self.assertEqual(tests[0].bzrdir_format, formats[0][1])
511
511
        self.assertEqual(tests[0].transport_server, server1)
512
512
        self.assertEqual(tests[0].transport_readonly_server, server2)
513
 
        self.assertEqual(tests[0].workingtree_to_test_tree, return_parameter)
 
513
        self.assertEqual(tests[0]._workingtree_to_test_tree, return_parameter)
514
514
        self.assertEqual(tests[1].workingtree_format, formats[1][0])
515
515
        self.assertEqual(tests[1].bzrdir_format, formats[1][1])
516
516
        self.assertEqual(tests[1].transport_server, server1)
517
517
        self.assertEqual(tests[1].transport_readonly_server, server2)
518
 
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
 
518
        self.assertEqual(tests[1]._workingtree_to_test_tree, return_parameter)
519
519
        self.assertIsInstance(tests[2].workingtree_format, default_format)
520
520
        #self.assertEqual(tests[2].bzrdir_format,
521
521
        #                 default_format._matchingbzrdir)
522
522
        self.assertEqual(tests[2].transport_server, server1)
523
523
        self.assertEqual(tests[2].transport_readonly_server, server2)
524
 
        self.assertEqual(tests[2].workingtree_to_test_tree,
 
524
        self.assertEqual(tests[2]._workingtree_to_test_tree,
525
525
            revision_tree_from_workingtree)
526
526
 
527
527
 
562
562
        self.assertEqual(tests[0].workingtree_format, formats[0][1])
563
563
        self.assertEqual(tests[0].workingtree_format_to, formats[0][2])
564
564
        self.assertEqual(tests[0].mutable_trees_to_test_trees, formats[0][3])
565
 
        self.assertEqual(tests[0].workingtree_to_test_tree, return_parameter)
 
565
        self.assertEqual(tests[0]._workingtree_to_test_tree, return_parameter)
566
566
        self.assertEqual(tests[0].transport_server, server1)
567
567
        self.assertEqual(tests[0].transport_readonly_server, server2)
568
568
        self.assertEqual(tests[1].intertree_class, formats[1][0])
569
569
        self.assertEqual(tests[1].workingtree_format, formats[1][1])
570
570
        self.assertEqual(tests[1].workingtree_format_to, formats[1][2])
571
571
        self.assertEqual(tests[1].mutable_trees_to_test_trees, formats[1][3])
572
 
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
 
572
        self.assertEqual(tests[1]._workingtree_to_test_tree, return_parameter)
573
573
        self.assertEqual(tests[1].transport_server, server1)
574
574
        self.assertEqual(tests[1].transport_readonly_server, server2)
575
575
 
921
921
        test.run(result)
922
922
        self.assertEqual(
923
923
            [
924
 
            ('update', '[2 in 0s, 3 known failures] passing_test', None, None),
 
924
            ('update', '[2 in 0s] passing_test', None, None),
925
925
            ],
926
926
            pb.calls[2:])
927
927
 
997
997
        test.run(result)
998
998
        self.assertEqual(
999
999
            [
1000
 
            ('update', '[2 in 0s, 2 missing features] passing_test', None, None),
 
1000
            ('update', '[2 in 0s, 2 missing] passing_test', None, None),
1001
1001
            ],
1002
1002
            pb.calls[1:])
1003
1003