← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/treeshape.py

[merge] jam-integration 1490

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/treeshape.py
31
31
import stat
32
32
 
33
33
from bzrlib.trace import warning
 
34
from bzrlib.osutils import pathjoin
34
35
 
35
36
def build_tree_contents(template):
36
37
    """Reconstitute some files from a text description.
63
64
        yield (dirpath + '/', )
64
65
        filenames.sort()
65
66
        for fn in filenames:
66
 
            fullpath = os.path.join(dirpath, fn)
 
67
            fullpath = pathjoin(dirpath, fn)
67
68
            self.assertFalse(fullpath[-1] in '@/')
68
69
            info = os.lstat(fullpath)
69
70
            if stat.S_ISLNK(info.st_mode):