← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

(vila) Provide a config section matcher respecting the file order. (Vincent
 Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
201
201
        self.assertIsInstance(
202
202
            SampleBranchFormat.from_string("Sample branch format."),
203
203
            SampleBranchFormat)
204
 
        self.assertRaises(ValueError,
 
204
        self.assertRaises(AssertionError,
205
205
            SampleBranchFormat.from_string, "Different branch format.")
206
206
 
207
207
    def test_find_format_not_branch(self):
217
217
                          _mod_branch.BranchFormatMetadir.find_format,
218
218
                          dir)
219
219
 
 
220
    def test_find_format_with_features(self):
 
221
        tree = self.make_branch_and_tree('.', format='2a')
 
222
        tree.branch.update_feature_flags({"name": "optional"})
 
223
        found_format = _mod_branch.BranchFormatMetadir.find_format(tree.bzrdir)
 
224
        self.assertIsInstance(found_format, _mod_branch.BranchFormatMetadir)
 
225
        self.assertEquals(found_format.features.get("name"), "optional")
 
226
        tree.branch.update_feature_flags({"name": None})
 
227
        branch = _mod_branch.Branch.open('.')
 
228
        self.assertEquals(branch._format.features, {})
 
229
 
220
230
    def test_register_unregister_format(self):
221
231
        # Test the deprecated format registration functions
222
232
        format = SampleBranchFormat()
346
356
        self.assertPathDoesNotExist('a/.bzr/branch/parent')
347
357
        self.assertEqual('http://example.com', branch.get_parent())
348
358
        branch.set_push_location('sftp://example.com')
349
 
        config = branch.get_config()._get_branch_data_config()
350
 
        self.assertEqual('sftp://example.com',
351
 
                         config.get_user_option('push_location'))
 
359
        config = branch.get_config_stack()
 
360
        self.assertEqual('sftp://example.com', config.get('push_location'))
352
361
        branch.set_bound_location('ftp://example.com')
353
362
        self.assertPathDoesNotExist('a/.bzr/branch/bound')
354
363
        self.assertEqual('ftp://example.com', branch.get_bound_location())
718
727
        f = StringIO()
719
728
        r.report(f)
720
729
        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
721