Rev 4627: Merge fix for test_write_group.py for 2a default. in http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/bug-398668

------------------------------------------------------------
revno: 4627 [merge]
revision-id: robertc at robertcollins.net-20090817041933-cocito5y3x8v8nk3
parent: robertc at robertcollins.net-20090817040045-pg2axbdvgzudu48d
parent: robertc at robertcollins.net-20090817041857-uwfbijkz22icnln6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-398668
timestamp: Mon 2009-08-17 14:19:33 +1000
message:
  Merge fix for test_write_group.py for 2a default.
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 = []