Mercurial > hg

changeset 35806:ab239e3de23b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add a pattern to fix --pure tests Test Plan: ran all tests with and without --pure, everything passed on gcc112. Differential Revision: https://phab.mercurial-scm.org/D1946
author Augie Fackler <augie@google.com>
date Sat, 27 Jan 2018 21:50:04 -0500
parents 784ac51f8bab
children 4425790f2373 91c8d2e763d1
files tests/common-pattern.py tests/test-clone-uncompressed.t tests/test-hgweb-commands.t
diffstat 3 files changed, 7 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/common-pattern.py	Fri Jan 26 16:01:42 2018 +0100
+++ b/tests/common-pattern.py	Sat Jan 27 21:50:04 2018 -0500
@@ -8,6 +8,9 @@
     (br'(zstd,)?zlib,none,bzip2',
      br'$USUAL_COMPRESSIONS$'
     ),
+    (br'=(zstd,)?zlib',
+     br'=$BUNDLE2_COMPRESSIONS$'
+    ),
     # capabilities sent through http
     (br'bundlecaps=HG20%2Cbundle2%3DHG20%250A'
      br'bookmarks%250A'
--- a/tests/test-clone-uncompressed.t	Fri Jan 26 16:01:42 2018 +0100
+++ b/tests/test-clone-uncompressed.t	Sat Jan 27 21:50:04 2018 -0500
@@ -39,7 +39,7 @@
     branchmap
     $USUAL_BUNDLE2_CAPS_SERVER$
     changegroupsubset
-    compression=zstd,zlib
+    compression=$BUNDLE2_COMPRESSIONS$
     getbundle
     httpheader=1024
     httpmediatype=0.1rx,0.1tx,0.2tx
@@ -104,7 +104,7 @@
     branchmap
     $USUAL_BUNDLE2_CAPS_SERVER$
     changegroupsubset
-    compression=zstd,zlib
+    compression=$BUNDLE2_COMPRESSIONS$
     getbundle
     httpheader=1024
     httpmediatype=0.1rx,0.1tx,0.2tx
--- a/tests/test-hgweb-commands.t	Fri Jan 26 16:01:42 2018 +0100
+++ b/tests/test-hgweb-commands.t	Sat Jan 27 21:50:04 2018 -0500
@@ -1914,7 +1914,7 @@
   $ get-with-headers.py $LOCALIP:$HGPORT '?cmd=capabilities'; echo
   200 Script output follows
   
-  lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=*zlib (glob)
+  lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch $USUAL_BUNDLE2_CAPS_SERVER$ unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=$BUNDLE2_COMPRESSIONS$
 
 heads
 
@@ -2140,7 +2140,7 @@
   unbundle=HG10GZ,HG10BZ,HG10UN
   httpheader=1024
   httpmediatype=0.1rx,0.1tx,0.2tx
-  compression=*zlib (glob)
+  compression=$BUNDLE2_COMPRESSIONS$
 
 heads