← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_init.py

Don't make explicit assumptions about testing current working dir.

On Windows, paths get shortened to avoid MAX_PATH limitations.
So we don't have the full path to the test in all invocations.
Just use 'cwd' instead of hard-coding the value.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_init.py
22
22
 
23
23
from bzrlib import (
24
24
    branch as _mod_branch,
 
25
    osutils,
25
26
    urlutils,
26
27
    )
27
28
from bzrlib.bzrdir import BzrDirMetaFormat1
74
75
Using shared repository: %s
75
76
""" % (self._default_label, urlutils.local_path_from_url(
76
77
            repo.bzrdir.root_transport.external_url())), out)
77
 
        self.assertEndsWith(out, "bzrlib.tests.blackbox.test_init.TestInit."
78
 
            "test_init_at_repository_root/work/repo/\n")
 
78
        cwd = osutils.getcwd()
 
79
        self.assertEndsWith(out, cwd + '/repo/\n')
79
80
        self.assertEqual('', err)
80
81
        newdir.open_branch()
81
82
        newdir.open_workingtree()