Patchwork D1946: tests: add a pattern to fix --pure tests

login
register
mail settings
Submitter phabricator
Date Jan. 29, 2018, 8:42 p.m.
Message ID <differential-rev-PHID-DREV-atdxsitxwzasw6wt2wmh-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/27075/
State Superseded
Headers show

Comments

phabricator - Jan. 29, 2018, 8:42 p.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

TEST PLAN
  ran all tests with and without --pure, everything passed on gcc112.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/common-pattern.py
  tests/test-clone-uncompressed.t
  tests/test-hgweb-commands.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-hgweb-commands.t b/tests/test-hgweb-commands.t
--- a/tests/test-hgweb-commands.t
+++ b/tests/test-hgweb-commands.t
@@ -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
 
diff --git a/tests/test-clone-uncompressed.t b/tests/test-clone-uncompressed.t
--- a/tests/test-clone-uncompressed.t
+++ b/tests/test-clone-uncompressed.t
@@ -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
diff --git a/tests/common-pattern.py b/tests/common-pattern.py
--- a/tests/common-pattern.py
+++ b/tests/common-pattern.py
@@ -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'