# HG changeset patch # User Augie Fackler # Date 2018-10-14 12:55:30 # Node ID 6519f5aee06fab3c55b865b4b645b7221fb7b79e # Parent f6ef89cf823429e27ca091fc26905a4799f051ea tests: use regex instead of Python versions for archive hash changes It turns out this behavior changed between versions of Python 3. Let's just always accept either size or sha1, and move on. Differential Revision: https://phab.mercurial-scm.org/D5104 diff --git a/tests/test-archive.t b/tests/test-archive.t --- a/tests/test-archive.t +++ b/tests/test-archive.t @@ -187,8 +187,7 @@ check http return codes server: testing stub value transfer-encoding: chunked - body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 (no-py3 !) - body: size=1461, sha1=be6d3983aa13dfe930361b2569291cdedd02b537 (py3 !) + body: size=(1377|1461), sha1=(677b14d3d048778d5eb5552c14a67e6192068650|be6d3983aa13dfe930361b2569291cdedd02b537) (re) % tar.gz and tar.bz2 disallowed should both give 403 403 Archive type not allowed: gz content-type: text/html; charset=ascii @@ -275,8 +274,7 @@ check http return codes (with deprecated server: testing stub value transfer-encoding: chunked - body: size=1377, sha1=677b14d3d048778d5eb5552c14a67e6192068650 (no-py3 !) - body: size=1461, sha1=be6d3983aa13dfe930361b2569291cdedd02b537 (py3 !) + body: size=(1377|1461), sha1=(677b14d3d048778d5eb5552c14a67e6192068650|be6d3983aa13dfe930361b2569291cdedd02b537) (re) % tar.gz and tar.bz2 disallowed should both give 403 403 Archive type not allowed: gz content-type: text/html; charset=ascii