changeset 40305:6519f5aee06f

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
author Augie Fackler <augie@google.com>
date Sun, 14 Oct 2018 08:55:30 -0400
parents f6ef89cf8234
children da1629c7dda1
files tests/test-archive.t
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-archive.t	Sun Oct 14 05:29:00 2018 -0400
+++ b/tests/test-archive.t	Sun Oct 14 08:55:30 2018 -0400
@@ -187,8 +187,7 @@
   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 @@
   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