Merge lp:~lifeless/bzr/knit-tests into lp:~bzr/bzr/trunk-old

[Robert Collins]

[Robert Collins (lifeless)]

[MERGE] Lock the format knit retry tests depend on - knits aren't used
for 2a formats.

--

[Andrew Bennetts (spiv)]

review: Approve

[John A Meinel (jameinel)]

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

Robert Collins wrote:
> Robert Collins has proposed merging lp:~lifeless/bzr/knit-tests into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
> [MERGE] Lock the format knit retry tests depend on - knits aren't used
> for 2a formats.
>
>

But we *should* retry the fetches for Groupcompress formats. I don't
know the specific test here, though.

John
=:->

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

iEYEARECAAYFAkqJW9IACgkQJdeBCYSNAAMqxgCfRT/VmwklRDG6ar+N4jG4biWl
C2IAnj+Dl7ZkRlpV41qTgAA7B/iCwUom
=jqdg
-----END PGP SIGNATURE-----

[Robert Collins (lifeless)]

On Mon, 2009-08-17 at 13:33 +0000, John A Meinel wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Robert Collins wrote:
> > Robert Collins has proposed merging lp:~lifeless/bzr/knit-tests into lp:bzr.
> >
> > Requested reviews:
> > bzr-core (bzr-core)
> >
> > [MERGE] Lock the format knit retry tests depend on - knits aren't used
> > for 2a formats.
> >
> >
>
> But we *should* retry the fetches for Groupcompress formats. I don't
> know the specific test here, though.

GCVF doesn't inherit from KVF, though it does the use DirectPackAccess
object directly too.

The test that is failing is currently knit-pack specific, locking it
neither reduces or expands test coverage : if we have a hole its
preserved.

-Rob

=== modified file 'bzrlib/tests/test_knit.py'
--- bzrlib/tests/test_knit.py	2009-07-28 08:09:13 +0000
+++ bzrlib/tests/test_knit.py	2009-08-17 20:35:53 +0000
@@ -366,7 +366,7 @@
         :return: (versioned_file, reload_counter)
             versioned_file  a KnitVersionedFiles using the packs for access
         """
-        builder = self.make_branch_builder('.')
+        builder = self.make_branch_builder('.', format="1.9")
         builder.start_series()
         builder.build_snapshot('rev-1', None, [
             ('add', ('', 'root-id', 'directory', None)),