Rev 4618: (robertc) Fix test_write_group to not test inappropriate things on in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4618 [merge]
revision-id: pqm at pqm.ubuntu.com-20090817073154-p4vkx71sjlhutjl3
parent: pqm at pqm.ubuntu.com-20090817003227-g813yyjlq47j9qyb
parent: robertc at robertcollins.net-20090817041857-uwfbijkz22icnln6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2009-08-17 08:31:54 +0100
message:
  (robertc) Fix test_write_group to not test inappropriate things on
  	RemoteRepository. (Robert Collins)
modified:
  bzrlib/tests/per_repository/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
=== modified file 'bzrlib/tests/per_repository/test_write_group.py'
--- a/bzrlib/tests/per_repository/test_write_group.py	2009-06-26 09:24:34 +0000
+++ b/bzrlib/tests/per_repository/test_write_group.py	2009-08-17 04:18:57 +0000
@@ -131,6 +131,7 @@
         # suppressed.  See also test_pack_repository's test of the same name.
         self.assertEqual(None, repo.abort_write_group(suppress_errors=True))
 
+
 class TestGetMissingParentInventories(TestCaseWithRepository):
 
     def test_empty_get_missing_parent_inventories(self):
@@ -332,8 +333,10 @@
 
     def test_insert_stream_passes_resume_info(self):
         repo = self.make_repository('test-repo')
-        if not repo._format.supports_external_lookups:
-            raise TestNotApplicable('only valid in resumable repos')
+        if (not repo._format.supports_external_lookups or
+            isinstance(repo, remote.RemoteRepository)):
+            raise TestNotApplicable(
+                'only valid for direct connections to resumable repos')
         # log calls to get_missing_parent_inventories, so that we can assert it
         # is called with the correct parameters
         call_log = []