Merge lp:~vila/bzr-builddeb/test-failures into lp:bzr-builddeb

[Vincent Ladeuil]

This fixes some test failures:

- test_upstream.test_fetch_tarball_repack requires a non-empty zip file (dunno how recent this is, but the test doesn't really care and I don't think we need to support empty zip files)

- some tests in test_merge_upstream.TestUpstreamVersionAddRevision requires a bzr-svn installed, mark them as such.

[lp:~vila/bzr-builddeb/test-failures]

510. By Vincent Ladeuil on 2011-02-03

Fix test failures requiring an installed bzr-svn and the test requiring a non-empty zip file

[Jelmer Vernooij (jelmer)]

On Thu, 2011-02-03 at 14:49 +0000, Vincent Ladeuil wrote:
> Vincent Ladeuil has proposed merging lp:~vila/bzr-builddeb/test-failures into lp:bzr-builddeb.
>
> Requested reviews:
> Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
> For more details, see:
> https://code.launchpad.net/~vila/bzr-builddeb/test-failures/+merge/48484
>
> This fixes some test failures:
>
> - test_upstream.test_fetch_tarball_repack requires a non-empty zip file (dunno how recent this is, but the test doesn't really care and I don't think we need to support empty zip files)
>
> - some tests in test_merge_upstream.TestUpstreamVersionAddRevision requires a bzr-svn installed, mark them as such.
> differences between files attachment (review-diff.txt)
> === modified file 'tests/test_merge_upstream.py'
> --- tests/test_merge_upstream.py 2011-01-29 03:29:44 +0000
> +++ tests/test_merge_upstream.py 2011-02-03 14:49:08 +0000
> @@ -24,6 +24,7 @@
> # Prior to 0.1.15 the debian module was called debian_bundle
> from debian_bundle.changelog import Version
>
> +from bzrlib import tests
> from bzrlib.revision import Revision
> from bzrlib.tests import TestCase, TestCaseWithTransport
>
> @@ -35,6 +36,22 @@
> upstream_version_add_revision
> )
>
> +# Unless bug #712474 is fixed and available in the minimum bzrlib required, we
> +# can't use:
> +# svn_plugin = tests.ModuleAvailableFeature('bzrlib.plugins.svn')
Can we perhaps check if the minimum bzrlib available is >= 2.3 final and
use it in that case. It'd also just be nice to mention when bug 712474
was fixed, so that it's easy to clean up this workaround later.

Otherwise:

  review approve

Cheers,

Jelmer

review: Approve

[Vincent Ladeuil (vila)]

I'll keep an eye on this in builddeb to clean it up when possible, but the corresponding fix hasn't landed yet in bzr and some bikeshedding may delay it further ;)

=== modified file 'tests/test_merge_upstream.py'
--- tests/test_merge_upstream.py	2011-01-29 03:29:44 +0000
+++ tests/test_merge_upstream.py	2011-02-03 15:17:01 +0000
@@ -24,6 +24,7 @@
     # Prior to 0.1.15 the debian module was called debian_bundle
     from debian_bundle.changelog import Version
 
+from bzrlib import tests
 from bzrlib.revision import Revision
 from bzrlib.tests import TestCase, TestCaseWithTransport
 
@@ -35,6 +36,22 @@
         upstream_version_add_revision
         )
 
+# Unless bug #712474 is fixed and available in the minimum bzrlib required, we
+# can't use:
+# svn_plugin = tests.ModuleAvailableFeature('bzrlib.plugins.svn')
+class SvnPluginAvailable(tests.Feature):
+
+    def feature_name(self):
+        return 'bzr-svn plugin'
+
+    def _probe(self):
+        try:
+            import bzrlib.plugins.svn
+            return True
+        except ImportError:
+            return False
+svn_plugin = SvnPluginAvailable()
+
 
 class TestUpstreamVersionAddRevision(TestCaseWithTransport):
   """Test that updating the version string works."""
@@ -52,7 +69,11 @@
   def get_revision(self, revid):
     rev = Revision(revid)
     if revid in self.svn_revnos:
+      self.requireFeature(svn_plugin)
+      # Fake a bzr-svn revision
       rev.foreign_revid = ("uuid", "bp", self.svn_revnos[revid])
+      from bzrlib.plugins.svn import mapping
+      rev.mapping = mapping.mapping_registry.get_default()()
     return rev
 
   def test_update_plus_rev(self):
@@ -68,6 +89,7 @@
         upstream_version_add_revision(self, "1.3", "somerev"))
 
   def test_svn_new_rev(self):
+    
     self.assertEquals("1.3+svn45", 
         upstream_version_add_revision(self, "1.3", "somesvnrev"))
 

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-02 20:30:13 +0000
+++ tests/test_upstream.py	2011-02-03 15:17:01 +0000
@@ -353,6 +353,7 @@
 
     def test_fetch_tarball_repack(self):
         zf = zipfile.ZipFile("bla-2.0.zip", "w")
+        zf.writestr('avoid', 'empty zip to make the repacker happy\n')
         zf.close()
         source = TarfileSource("bla-2.0.zip", "2.0")
         os.mkdir("bar")