← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
53
53
        self.assertEqual('CD', new_branch.last_revision())
54
54
        self.assertEqual('file:///EF', new_branch.get_parent())
55
55
        self.assertEqual('file:///GH', new_branch.get_bound_location())
56
 
        branch_config = new_branch.get_config()._get_branch_data_config()
57
 
        self.assertEqual('file:///IJ',
58
 
            branch_config.get_user_option('push_location'))
 
56
        branch_config = new_branch.get_config_stack()
 
57
        self.assertEqual('file:///IJ', branch_config.get('push_location'))
59
58
 
60
59
        b2 = self.make_branch('branch2', format='knit')
61
60
        converter = b2.bzrdir._format.get_converter(target)