← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

Merge lockable-config-files into remove-gratuitous-ensure-config-dir-exist-calls resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
86
86
        self.assertIsDirectory('.bzr/branch/lock/held', t)
87
87
 
88
88
    def test_set_push_location(self):
89
 
        conf = config.LocationConfig.from_bytes('# comment\n', '.', save=True)
 
89
        conf = config.LocationConfig.from_string('# comment\n', '.', save=True)
90
90
 
91
91
        branch = self.make_branch('.', format='knit')
92
92
        branch.set_push_location('foo')