← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_bzrdir/test_bzrdir.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_bzrdir/test_bzrdir.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 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
169
169
        TestSkipped.  Returns the newly created working tree.
170
170
        """
171
171
        try:
172
 
            return a_bzrdir.create_workingtree()
 
172
            # This passes in many named options to make sure they're
 
173
            # understood by subclasses: see
 
174
            # <https://bugs.launchpad.net/bzr/+bug/524627>.
 
175
            return a_bzrdir.create_workingtree(
 
176
                revision_id=None,
 
177
                from_branch=None,
 
178
                accelerator_tree=None,
 
179
                hardlink=False)
173
180
        except errors.NotLocalUrl:
174
181
            raise TestSkipped("cannot make working tree with transport %r"
175
182
                              % a_bzrdir.transport)