Merge lp:~jelmer/bzr-builddeb/712180-zipfile-python2.6 into lp:bzr-builddeb

[Jelmer Vernooij]

Fix zipfile tests on Python2.6. It doesn't like empty files, so add one.

[Vincent Ladeuil (vila)]

https://code.launchpad.net/~vila/bzr-builddeb/test-failures/+merge/48484 use a simpler version

I checked zipfile.writestr for python2.[456], three different versions all accepting the simpler one proposed above but varying slightly implementing yours.

As said on IRC, I'll steal the bug ;)

review: Disapprove

Unmerged revisions

508. By Jelmer Vernooij on 2011-02-03

Fix the use of zipfile in tests on python2.6.

=== modified file 'tests/test_upstream.py'
--- tests/test_upstream.py	2011-02-02 13:18:56 +0000
+++ tests/test_upstream.py	2011-02-03 10:35:11 +0000
@@ -25,6 +25,7 @@
 
 import os
 import tarfile
+import time
 import zipfile
 
 from bzrlib.tests import (
@@ -354,6 +355,11 @@
 
     def test_fetch_tarball_repack(self):
         zf = zipfile.ZipFile("bla-2.0.zip", "w")
+        now = time.localtime(time.time())[:6]
+        info = zipfile.ZipInfo("lolwat")
+        info.date_time = now
+        info.compress_type = zipfile.ZIP_DEFLATED
+        zf.writestr(info, "miau")
         zf.close()
         source = TarfileSource("bla-2.0.zip", "2.0")
         os.mkdir("bar")