Rev 5878: (jelmer) Raise TestNotApplicable for tests that use in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5878 [merge]
revision-id: pqm at pqm.ubuntu.com-20110517134836-plmyte47knc8nn7y
parent: pqm at pqm.ubuntu.com-20110517124455-8mzoceddh4wjmtgp
parent: jelmer at samba.org-20110517121359-iw5vhh74rhc54ews
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2011-05-17 13:48:36 +0000
message:
  (jelmer) Raise TestNotApplicable for tests that use
   WorkingTree.apply_inventory_delta against formats that don't support the
   full versionedfiles API. (Jelmer Vernooij)
modified:
  bzrlib/tests/per_workingtree/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
=== modified file 'bzrlib/tests/per_workingtree/test_inv.py'
--- a/bzrlib/tests/per_workingtree/test_inv.py	2011-05-09 14:09:52 +0000
+++ b/bzrlib/tests/per_workingtree/test_inv.py	2011-05-17 12:13:59 +0000
@@ -41,6 +41,12 @@
 
 class TestApplyInventoryDelta(TestCaseWithWorkingTree):
 
+    def setUp(self):
+        super(TestApplyInventoryDelta, self).setUp()
+        if not self.bzrdir_format.repository_format.supports_full_versioned_files:
+            raise tests.TestNotApplicable(
+                "format does not support inventory deltas")
+
     def test_add(self):
         wt = self.make_branch_and_tree('.')
         wt.lock_write()
@@ -157,6 +163,9 @@
 
     def test_tree_reference_matches_inv(self):
         base = self.make_branch_and_tree('base')
+        if base.branch.repository._format.supports_full_versioned_files:
+            raise tests.TestNotApplicable(
+                "format does not support inventory deltas")
         if not base.supports_tree_reference():
             raise tests.TestNotApplicable("wt doesn't support nested trees")
         # We add it as a directory, but it becomes a tree-reference