Merge lp:~lifeless/bzr/test_write_group into lp:~bzr/bzr/trunk-old

[Robert Collins]

[Robert Collins (lifeless)]

This test wants to check how a repository that has state handles calling
an internal helper function. RemoteRepository proxies all these
requests, so is not able to be tested. The guard on the test was
excluding RemoteRepository earlier, because the default format wasn't
capable of doing external references.

--

[Vincent Ladeuil (vila)]

review: Approve

=== modified file 'bzrlib/tests/per_repository/test_write_group.py'
--- bzrlib/tests/per_repository/test_write_group.py	2009-06-26 09:24:34 +0000
+++ bzrlib/tests/per_repository/test_write_group.py	2009-08-17 04:35:10 +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 = []