Patchwork [3,of,5] py3: adapt test-largefiles-wireproto.t to python3

login
register
mail settings
Submitter Matt Harbison
Date Dec. 10, 2018, 3:44 a.m.
Message ID <8f35bbc97ab5ec0ab507.1544413475@Envy>
Download mbox | patch
Permalink /patch/37044/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 10, 2018, 3:44 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1544398535 18000
#      Sun Dec 09 18:35:35 2018 -0500
# Node ID 8f35bbc97ab5ec0ab5072900b9a70cea8fe720d0
# Parent  8c34826326a95e218e9fac10ec5dc66cff3d912f
py3: adapt test-largefiles-wireproto.t to python3

Patch

diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -305,6 +305,7 @@  test-largefiles-cache.t
 test-largefiles-misc.t
 test-largefiles-small-disk.t
 test-largefiles-update.t
+test-largefiles-wireproto.t
 test-largefiles.t
 test-lfconvert.t
 test-lfs-bundle.t
diff --git a/tests/test-largefiles-wireproto.t b/tests/test-largefiles-wireproto.t
--- a/tests/test-largefiles-wireproto.t
+++ b/tests/test-largefiles-wireproto.t
@@ -240,10 +240,10 @@  Clone over http, no largefiles pulled on
 
 Archive contains largefiles
   >>> import os
-  >>> import urllib2
+  >>> from mercurial import urllibcompat
   >>> u = 'http://localhost:%s/archive/default.zip' % os.environ['HGPORT2']
-  >>> with open('archive.zip', 'w') as f:
-  ...     f.write(urllib2.urlopen(u).read()) and None
+  >>> with open('archive.zip', 'wb') as f:
+  ...     f.write(urllibcompat.urlreq.urlopen(u).read()) and None
   $ unzip -t archive.zip
   Archive:  archive.zip
       testing: empty-default/.hg_archival.txt*OK (glob)