# HG changeset patch # User Pierre-Yves David # Date 1642504873 -3600 # Node ID 198c0fddeb2af594b79551ca3b3d9f42410f66ec # Parent a746d13987a643ee2aadfd3936ea2ea41212a1fd stream-requirements: smoother matching in test-ssh-bundle1.t The value of `streamreqs` changes depending of the format used, but this is not relevant for this tests. So we doing a smarter matching of the line to avoid this test interfering with format changes in the future. Differential Revision: https://phab.mercurial-scm.org/D12081 diff -r a746d13987a6 -r 198c0fddeb2a tests/test-ssh-bundle1.t --- a/tests/test-ssh-bundle1.t Tue Jan 18 12:02:50 2022 +0100 +++ b/tests/test-ssh-bundle1.t Tue Jan 18 12:21:13 2022 +0100 @@ -475,10 +475,8 @@ running .* ".*[/\\]dummyssh" ['"]user@dummy['"] ['"]hg -R remote serve --stdio['"] (re) sending hello command sending between command - remote: 444 (no-rust !) - remote: 463 (rust !) - remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-rust !) - remote: capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,persistent-nodemap,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (rust !) + remote: \d+ (re) + remote: capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (re) remote: 1 sending protocaps command preparing listkeys for "bookmarks"