← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-24 10:10:59 UTC
  • mfrom: (6405 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6407.
  • Revision ID: jelmer@samba.org-20111224101059-epghsc5y61hsgbl2
Merge bzr.dev.

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.control_transport.put_bytes('format',
 
223
            tree.branch._format.get_format_string() +
 
224
            "optional name\n")
 
225
        found_format = _mod_branch.BranchFormatMetadir.find_format(tree.bzrdir)
 
226
        self.assertIsInstance(found_format, _mod_branch.BranchFormatMetadir)
 
227
        self.assertEquals(found_format.features.get("name"), "optional")
 
228
 
220
229
    def test_register_unregister_format(self):
221
230
        # Test the deprecated format registration functions
222
231
        format = SampleBranchFormat()
403
412
    def test_light_checkout_with_references(self):
404
413
        self.do_checkout_test(lightweight=True)
405
414
 
406
 
    def test_set_push(self):
407
 
        branch = self.make_branch('source', format=self.get_format_name())
408
 
        branch.get_config().set_user_option('push_location', 'old',
409
 
            store=config.STORE_LOCATION)
410
 
        warnings = []
411
 
        def warning(*args):
412
 
            warnings.append(args[0] % args[1:])
413
 
        _warning = trace.warning
414
 
        trace.warning = warning
415
 
        try:
416
 
            branch.set_push_location('new')
417
 
        finally:
418
 
            trace.warning = _warning
419
 
        self.assertEqual(warnings[0], 'Value "new" is masked by "old" from '
420
 
                         'locations.conf')
421
 
 
422
415
 
423
416
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
424
417
 
734
727
        f = StringIO()
735
728
        r.report(f)
736
729
        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
737