← 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: Martin Packman
  • Date: 2012-01-05 10:44:12 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6427.
  • Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts

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()
403
413
    def test_light_checkout_with_references(self):
404
414
        self.do_checkout_test(lightweight=True)
405
415
 
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
416
 
423
417
class TestBranch6(TestBranch67, tests.TestCaseWithTransport):
424
418
 
734
728
        f = StringIO()
735
729
        r.report(f)
736
730
        self.assertEqual("No revisions or tags to pull.\n", f.getvalue())
737