← 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 by-reference-trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
354
354
            return_parameter,
355
355
            revision_tree_from_workingtree
356
356
            )
357
 
        from bzrlib.workingtree import WorkingTreeFormat
 
357
        from bzrlib.workingtree import WorkingTreeFormat, WorkingTreeFormatAB1
358
358
        input_test = TestTreeProviderAdapter(
359
359
            "test_adapted_tests")
360
360
        server1 = "a"
363
363
        adapter = TreeTestProviderAdapter(server1, server2, formats)
364
364
        suite = adapter.adapt(input_test)
365
365
        tests = list(iter(suite))
366
 
        self.assertEqual(4, len(tests))
367
 
        default_format = WorkingTreeFormat.get_default_format()
 
366
        self.assertEqual(5, len(tests))
 
367
        default_format = WorkingTreeFormatAB1
368
368
        self.assertEqual(tests[0].workingtree_format, formats[0][0])
369
369
        self.assertEqual(tests[0].bzrdir_format, formats[0][1])
370
370
        self.assertEqual(tests[0].transport_server, server1)
375
375
        self.assertEqual(tests[1].transport_server, server1)
376
376
        self.assertEqual(tests[1].transport_readonly_server, server2)
377
377
        self.assertEqual(tests[1].workingtree_to_test_tree, return_parameter)
378
 
        self.assertEqual(tests[2].workingtree_format, default_format)
379
 
        self.assertEqual(tests[2].bzrdir_format, default_format._matchingbzrdir)
 
378
        self.assertIsInstance(tests[2].workingtree_format, default_format)
 
379
        #self.assertEqual(tests[2].bzrdir_format,
 
380
        #                 default_format._matchingbzrdir)
380
381
        self.assertEqual(tests[2].transport_server, server1)
381
382
        self.assertEqual(tests[2].transport_readonly_server, server2)
382
383
        self.assertEqual(tests[2].workingtree_to_test_tree,