Merge lp:~lifeless/bzr/bug-389141 into lp:~bzr/bzr/trunk-old

[Robert Collins]

[Robert Collins (lifeless)]

As I commented in bug 389141 this makes an expected fail test work
again, needed for 2a.

I'd like John's input specifically on this.

-Rob

--

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> Robert Collins has proposed merging lp:~lifeless/bzr/bug-389141 into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> As I commented in bug 389141 this makes an expected fail test work
> again, needed for 2a.
>
> I'd like John's input specifically on this.
>
> -Rob
>
>

This is changing the meaning of the test, which is why I left it at
expectedFailure. AFAICT it means that streaming from a broken source now
"works" in that we fill in the data we need.

It would be nice to have a test that errors reading from the source are
raised rather than suppressed. Having a test that says "either error or
succeed with correct data" is at least better than not having anything,
I guess.

 review: approve
 merge: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkqFc+QACgkQJdeBCYSNAANWBwCdEWdXc6rXXC9lYqv5XlJxUocu
uJEAoM5d33ItpGrJoh0kBtUEIulz0ZKR
=iE+V
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'bzrlib/tests/test_repository.py'
--- bzrlib/tests/test_repository.py	2009-06-29 15:07:51 +0000
+++ bzrlib/tests/test_repository.py	2009-08-15 13:36:00 +0000
@@ -1008,14 +1008,17 @@
         """
         broken_repo = self.make_broken_repository()
         empty_repo = self.make_repository('empty-repo')
-        # See bug https://bugs.launchpad.net/bzr/+bug/389141 for information
-        # about why this was turned into expectFailure
-        self.expectFailure('new Stream fetch fills in missing compression'
-           ' parents (bug #389141)',
-           self.assertRaises, (errors.RevisionNotPresent, errors.BzrCheckError),
-                              empty_repo.fetch, broken_repo)
-        self.assertRaises((errors.RevisionNotPresent, errors.BzrCheckError),
-                          empty_repo.fetch, broken_repo)
+        try:
+            empty_repo.fetch(broken_repo)
+        except (errors.RevisionNotPresent, errors.BzrCheckError):
+            # Test successful: compression parent not being copied leads to
+            # error.
+            return
+        empty_repo.lock_read()
+        self.addCleanup(empty_repo.unlock)
+        text = empty_repo.texts.get_record_stream(
+            [('file2-id', 'rev3')], 'topological', True).next()
+        self.assertEqual('line\n', text.get_bytes_as('fulltext'))
 
 
 class TestRepositoryPackCollection(TestCaseWithTransport):