← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-08 10:50:51 UTC
  • mfrom: (5050.17.31 2.2.2-dev)
  • mto: This revision was merged to the branch mainline in revision 5474.
  • Revision ID: v.ladeuil+lp@free.fr-20101008105051-xd4knkrohzclffic
Merge 2.2 into trunk including fixes for bug #651706 and bug #646133

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
58
58
)
59
59
from bzrlib.merge import Merge3Merger, Merger
60
60
from bzrlib.tests import (
 
61
    features,
61
62
    HardlinkFeature,
62
63
    SymlinkFeature,
63
64
    TestCase,
853
854
        rename.apply()
854
855
 
855
856
    def test_rename_fails(self):
 
857
        self.requireFeature(features.not_running_as_root)
856
858
        # see https://bugs.launchpad.net/bzr/+bug/491763
857
859
        create, root_id = self.get_transform()
858
860
        first_dir = create.new_directory('first-dir', root_id, 'first-id')