← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Merge from dirstate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
411
411
        server2 = "b"
412
412
        format1 = WorkingTreeFormat2()
413
413
        format2 = WorkingTreeFormat3()
414
 
        formats = [(str, format1, format2, False, True),
415
 
            (int, format2, format1, False, True)]
 
414
        formats = [(str, format1, format2, "converter1"),
 
415
            (int, format2, format1, "converter2")]
416
416
        adapter = InterTreeTestProviderAdapter(server1, server2, formats)
417
417
        suite = adapter.adapt(input_test)
418
418
        tests = list(iter(suite))
419
419
        self.assertEqual(2, len(tests))
420
420
        self.assertEqual(tests[0].intertree_class, formats[0][0])
421
421
        self.assertEqual(tests[0].workingtree_format, formats[0][1])
422
 
        self.assertEqual(tests[0].workingtree_to_test_tree, formats[0][2])
423
 
        self.assertEqual(tests[0].workingtree_format_to, formats[0][3])
424
 
        self.assertEqual(tests[0].workingtree_to_test_tree_to, formats[0][4])
 
422
        self.assertEqual(tests[0].workingtree_format_to, formats[0][2])
 
423
        self.assertEqual(tests[0].mutable_trees_to_test_trees, formats[0][3])
 
424
        self.assertEqual(tests[0].workingtree_to_test_tree, return_parameter)
425
425
        self.assertEqual(tests[0].transport_server, server1)
426
426
        self.assertEqual(tests[0].transport_readonly_server, server2)
427
427
        self.assertEqual(tests[1].intertree_class, formats[1][0])
428
428
        self.assertEqual(tests[1].workingtree_format, formats[1][1])
429
 
        self.assertEqual(tests[1].workingtree_to_test_tree, formats[1][2])
430
 
        self.assertEqual(tests[1].workingtree_format_to, formats[1][3])
431
 
        self.assertEqual(tests[1].workingtree_to_test_tree_to, formats[1][4])
 
429
        self.assertEqual(tests[1].workingtree_format_to, formats[1][2])
 
430
        self.assertEqual(tests[1].mutable_trees_to_test_trees, formats[1][3])
 
431
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
432
432
        self.assertEqual(tests[1].transport_server, server1)
433
433
        self.assertEqual(tests[1].transport_readonly_server, server2)
434
434