Rev 5100: (vila) One more fixed test related to bug #646133 (Vincent Ladeuil) in file:///home/pqm/archives/thelove/bzr/2.2/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/2.2/

------------------------------------------------------------
revno: 5100 [merge]
revision-id: pqm at pqm.ubuntu.com-20101006235214-bebymqb1lyjjc1l1
parent: pqm at pqm.ubuntu.com-20101006174610-vh2qcj2o7kgc3tjg
parent: v.ladeuil+lp at free.fr-20101006212958-s1218ahlqahjr2w3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 2.2
timestamp: Thu 2010-10-07 00:52:14 +0100
message:
  (vila) One more fixed test related to bug #646133 (Vincent Ladeuil)
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
=== modified file 'NEWS'
--- a/NEWS	2010-09-30 08:49:08 +0000
+++ b/NEWS	2010-10-06 16:24:33 +0000
@@ -23,7 +23,8 @@
   needed to succesfully run the test suite for installed versions.
   (Vincent Ladeuil, #644855).
 
-* Skip the tests that requires respecting the chmod bits when running as root.
+* Skip the tests that requires respecting the chmod bits when running as
+  root. Including the one that wasn't present in 2.1.
   (Vincent Ladeuil, #646133)
 
 Improvements

=== modified file 'bzrlib/tests/test_transform.py'
--- a/bzrlib/tests/test_transform.py	2010-07-21 10:38:31 +0000
+++ b/bzrlib/tests/test_transform.py	2010-10-06 21:29:58 +0000
@@ -58,6 +58,7 @@
 )
 from bzrlib.merge import Merge3Merger, Merger
 from bzrlib.tests import (
+    features,
     HardlinkFeature,
     SymlinkFeature,
     TestCase,
@@ -853,6 +854,7 @@
         rename.apply()
 
     def test_rename_fails(self):
+        self.requireFeature(features.not_running_as_root)
         # see https://bugs.launchpad.net/bzr/+bug/491763
         create, root_id = self.get_transform()
         first_dir = create.new_directory('first-dir', root_id, 'first-id')