← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_stacking.py

  • Committer: Martin Pool
  • Date: 2008-07-15 04:43:19 UTC
  • mto: This revision was merged to the branch mainline in revision 3542.
  • Revision ID: mbp@sourcefrog.net-20080715044319-wy26hdr8kvrb0ne9
Rename branch.get_stacked_on to get_stacked_on_url

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_stacking.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
"""Tests for Branch.get_stacked_on and set_stacked_on."""
 
17
"""Tests for Branch.get_stacked_on_url and set_stacked_on."""
18
18
 
19
19
from bzrlib import (
20
20
    bzrdir,
42
42
            branch.set_stacked_on(target.base)
43
43
        except old_format_errors:
44
44
            # if the set failed, so must the get
45
 
            self.assertRaises(old_format_errors, branch.get_stacked_on)
 
45
            self.assertRaises(old_format_errors, branch.get_stacked_on_url)
46
46
            return
47
47
        # now we have a stacked branch:
48
 
        self.assertEqual(target.base, branch.get_stacked_on())
 
48
        self.assertEqual(target.base, branch.get_stacked_on_url())
49
49
        branch.set_stacked_on(None)
50
 
        self.assertRaises(errors.NotStacked, branch.get_stacked_on)
 
50
        self.assertRaises(errors.NotStacked, branch.get_stacked_on_url)
51
51
 
52
52
    def assertRevisionInRepository(self, repo_path, revid):
53
53
        """Check that a revision is in a repository, disregarding stacking."""