← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_parent.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_parent.py
1
 
# Copyright (C) 2004, 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010 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
96
96
        if sys.platform != 'win32':
97
97
            raise TestSkipped('windows-specific test')
98
98
        b = self.make_branch('.')
99
 
        base_url = b.abspath('.')
 
99
        base_url = b.bzrdir.transport.abspath('.')
100
100
        if not base_url.startswith('file:///'):
101
101
            raise TestNotApplicable('this test should be run with local base')
102
102
        base = urlutils.local_path_from_url(base_url)
103
 
        other = 'file:///B:/path'
 
103
        other = 'file:///D:/path'
104
104
        if base[0] != 'C':
105
105
            other = 'file:///C:/path'
106
106
        b.set_parent(other)