This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12077

stream-requirements: smoother matching in test-ssh-proto-unbundle.t
ClosedPublic

Authored by marmoute on Jan 24 2022, 9:49 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG77f8f8caf859: stream-requirements: smoother matching in test-ssh-proto-unbundle.t
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jan 24 2022, 9:49 AM
Alphare accepted this revision.Jan 24 2022, 11:07 AM
This revision is now accepted and ready to land.Jan 24 2022, 11:07 AM
baymax updated this revision to Diff 31842.Jan 24 2022, 1:07 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Revision Contents
Changeset List

PathPackages
Mtests/test-ssh-proto-unbundle.t (92 lines)

Diff 31953

tests/test-ssh-proto-unbundle.t

creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
testing ssh1 testing ssh1
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline\(\) -> \d+: (re)
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9:
creating ssh peer from handshake results creating ssh peer from handshake results
i> write(104) -> 104: i> write(104) -> 104:
i> hello\n i> hello\n
i> between\n i> between\n
i> pairs 81\n i> pairs 81\n
i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000 i> 0000000000000000000000000000000000000000-0000000000000000000000000000000000000000
i> flush() -> None i> flush() -> None
o> readline() -> 4: o> readline() -> 4:
o> 444\n o> \d+\\n (re)
o> readline() -> 444: o> readline\(\) -> \d+: (re)
o> capabilities: batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\n o> capabilities: batch branchmap \$USUAL_BUNDLE2_CAPS\$ changegroupsubset getbundle known lookup protocaps pushkey streamreqs=[^ ,]+(,[^ ,]+)* unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash\\n (re)
o> readline() -> 2: o> readline() -> 2:
o> 1\n o> 1\n
o> readline() -> 1: o> readline() -> 1:
o> \n o> \n
sending unbundle command sending unbundle command
i> write(9) -> 9: i> write(9) -> 9:
i> unbundle\n i> unbundle\n
i> write(9) -> 9: i> write(9) -> 9: