← 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 lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
356
356
        self.assertPathDoesNotExist('a/.bzr/branch/parent')
357
357
        self.assertEqual('http://example.com', branch.get_parent())
358
358
        branch.set_push_location('sftp://example.com')
359
 
        config = branch.get_config_stack()
360
 
        self.assertEqual('sftp://example.com', config.get('push_location'))
 
359
        conf = branch.get_config_stack()
 
360
        self.assertEqual('sftp://example.com', conf.get('push_location'))
361
361
        branch.set_bound_location('ftp://example.com')
362
362
        self.assertPathDoesNotExist('a/.bzr/branch/bound')
363
363
        self.assertEqual('ftp://example.com', branch.get_bound_location())