D5104: tests: use regex instead of Python versions for archive hash changes

[durin42 (Augie Fackler)]

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

REVISION SUMMARY
  It turns out this behavior changed between versions of Python 3. Let's
  just always accept either size or sha1, and move on.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  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,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



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