D5075: tests: accept slightly different zip file in Python 3

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Sat Oct 13 11:57:51 UTC 2018


durin42 created this revision.
Herald added a reviewer: pulkit.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  I added some `unzip -t` here and I *think* the only change is from
  Python 3 having more data in the zip file headers or something. Sigh.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D5075

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-archive.t

CHANGE DETAILS

diff --git a/tests/test-archive.t b/tests/test-archive.t
--- a/tests/test-archive.t
+++ b/tests/test-archive.t
@@ -187,7 +187,8 @@
   server: testing stub value
   transfer-encoding: chunked
   
-  body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650
+  body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 (no-py3k !)
+  body: size=1461, sha1=be6d3983aa13dfe930361b2569291cdedd02b537 (py3k !)
   % tar.gz and tar.bz2 disallowed should both give 403
   403 Archive type not allowed: gz
   content-type: text/html; charset=ascii
@@ -274,7 +275,8 @@
   server: testing stub value
   transfer-encoding: chunked
   
-  body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650
+  body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 (no-py3k !)
+  body: size=1461, sha1=be6d3983aa13dfe930361b2569291cdedd02b537 (py3k !)
   % tar.gz and tar.bz2 disallowed should both give 403
   403 Archive type not allowed: gz
   content-type: text/html; charset=ascii
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -14,6 +14,7 @@
 test-annotate.py
 test-annotate.t
 test-archive-symlinks.t
+test-archive.t
 test-atomictempfile.py
 test-audit-path.t
 test-audit-subrepo.t



To: durin42, pulkit, #hg-reviewers
Cc: mjpieters, mercurial-devel


More information about the Mercurial-devel mailing list