This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5075

tests: accept slightly different zip file in Python 3
ClosedPublic

Authored by durin42 on Oct 13 2018, 7:57 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGc9e8c93e241c: tests: accept slightly different zip file in Python 3
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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Oct 13 2018, 7:57 AM
pulkit accepted this revision.Oct 13 2018, 8:11 AM
Closed by commit rHGc9e8c93e241c: tests: accept slightly different zip file in Python 3 (authored by durin42). · Explain WhyOct 13 2018, 8:21 AM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Oct 13 2018, 10:09 AM
  • body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650

+ body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 (no-py3k !)
+ body: size=1461, sha1=be6d3983aa13dfe930361b2569291cdedd02b537 (py3k !)

For some reason, my Python 3 says
size=1489, sha1=1897e496871aa89ad685a92b936f5fa0d008b9e8

pulkit added a comment.Oct 13 2018, 10:25 AM
In D5075#76117, @yuja wrote:
  • body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650

+ body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 (no-py3k !)
+ body: size=1461, sha1=be6d3983aa13dfe930361b2569291cdedd02b537 (py3k !)

For some reason, my Python 3 says
size=1489, sha1=1897e496871aa89ad685a92b936f5fa0d008b9e8

I suspect it's because we have different versions on Python 3.

durin42 added a comment.Oct 13 2018, 10:27 AM
In D5075#76125, @pulkit wrote:
In D5075#76117, @yuja wrote:
  • body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650

+ body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 (no-py3k !)
+ body: size=1461, sha1=be6d3983aa13dfe930361b2569291cdedd02b537 (py3k !)

For some reason, my Python 3 says
size=1489, sha1=1897e496871aa89ad685a92b936f5fa0d008b9e8

I suspect it's because we have different versions on Python 3.

Ugh. Should we just glob the size and sha1 then? I'm a little hesitant to do that, but I don't see many other paths forward...

indygreg added a subscriber: indygreg.Oct 13 2018, 10:42 AM

Behavior changed between Python 3.6 and Python 3.7.

We should add pyXX hghave capabilities to differentiate on Python versions. Or we could annotate all possible lines with (?) (optional output). The hghave approach is better.

Revision Contents
Changeset List

PathPackages
Mcontrib/python3-whitelist (1 line)
Mtests/test-archive.t (6 lines)

Diff 12058

contrib/python3-whitelist

test-abort-checkin.t test-abort-checkin.t
test-absorb-filefixupstate.py test-absorb-filefixupstate.py
test-absorb-phase.t test-absorb-phase.t
test-absorb-rename.t test-absorb-rename.t
test-absorb-strip.t test-absorb-strip.t
test-absorb.t test-absorb.t
test-add.t test-add.t
test-addremove-similar.t test-addremove-similar.t
test-addremove.t test-addremove.t
test-alias.t test-alias.t
test-amend-subrepo.t test-amend-subrepo.t
test-amend.t test-amend.t
test-ancestor.py test-ancestor.py
test-annotate.py test-annotate.py
test-annotate.t test-annotate.t
test-archive-symlinks.t test-archive-symlinks.t
test-archive.t
test-atomictempfile.py test-atomictempfile.py
test-audit-path.t test-audit-path.t
test-audit-subrepo.t test-audit-subrepo.t
test-automv.t test-automv.t
test-backout.t test-backout.t
test-backwards-remove.t test-backwards-remove.t
test-bad-extension.t test-bad-extension.t
test-bad-pull.t test-bad-pull.t

tests/test-archive.t

200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.zip content-disposition: attachment; filename=test-archive-1701ef1f1510.zip
content-type: application/zip content-type: application/zip
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: testing stub value server: testing stub value
transfer-encoding: chunked 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 % tar.gz and tar.bz2 disallowed should both give 403
403 Archive type not allowed: gz 403 Archive type not allowed: gz
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: testing stub value server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked
200 Script output follows 200 Script output follows
content-disposition: attachment; filename=test-archive-1701ef1f1510.zip content-disposition: attachment; filename=test-archive-1701ef1f1510.zip
content-type: application/zip content-type: application/zip
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: testing stub value server: testing stub value
transfer-encoding: chunked 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 % tar.gz and tar.bz2 disallowed should both give 403
403 Archive type not allowed: gz 403 Archive type not allowed: gz
content-type: text/html; charset=ascii content-type: text/html; charset=ascii
date: $HTTP_DATE$ date: $HTTP_DATE$
etag: W/"*" (glob) etag: W/"*" (glob)
server: testing stub value server: testing stub value
transfer-encoding: chunked transfer-encoding: chunked