← 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: 2009-12-10 17:16:19 UTC
  • mfrom: (4884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210171619-ehdcxjbl8afhq9g1
Bring in bzr.dev 4884

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_parent.py
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)