← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Branch now uses BzrDir reasonably sanely.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
217
217
            "test_adapted_tests")
218
218
        server1 = "a"
219
219
        server2 = "b"
220
 
        formats = ["c", "d"]
 
220
        formats = [("c", "C"), ("d", "D")]
221
221
        adapter = BranchTestProviderAdapter(server1, server2, formats)
222
222
        suite = adapter.adapt(input_test)
223
223
        tests = list(iter(suite))
224
224
        self.assertEqual(2, len(tests))
225
 
        self.assertEqual(tests[0].branch_format, formats[0])
 
225
        self.assertEqual(tests[0].branch_format, formats[0][0])
 
226
        self.assertEqual(tests[0].bzrdir_format, formats[0][1])
226
227
        self.assertEqual(tests[0].transport_server, server1)
227
228
        self.assertEqual(tests[0].transport_readonly_server, server2)
228
 
        self.assertEqual(tests[1].branch_format, formats[1])
 
229
        self.assertEqual(tests[1].branch_format, formats[1][0])
 
230
        self.assertEqual(tests[1].bzrdir_format, formats[1][1])
229
231
        self.assertEqual(tests[1].transport_server, server1)
230
232
        self.assertEqual(tests[1].transport_readonly_server, server2)
231
233