##// END OF EJS Templates
tests: refactor common bundle2 capabilities...
Joerg Sonnenberger -
r38751:88be288e @86 default
parent child Browse files
Show More
@@ -71,6 +71,20 b' substitutions = ['
71 # (replacement patterns)
71 # (replacement patterns)
72 br'$USUAL_BUNDLE2_CAPS_SERVER$'
72 br'$USUAL_BUNDLE2_CAPS_SERVER$'
73 ),
73 ),
74 (
75 br'bundle2=HG20%0A'
76 br'bookmarks%0A'
77 br'changegroup%3D01%2C02%0A'
78 br'digests%3Dmd5%2Csha1%2Csha512%0A'
79 br'error%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0A'
80 br'hgtagsfnodes%0A'
81 br'listkeys%0A'
82 br'pushkey%0A'
83 br'remote-changegroup%3Dhttp%2Chttps%0A'
84 br'rev-branch-cache',
85 # (replacement patterns)
86 br'$USUAL_BUNDLE2_CAPS_NO_PHASES$'
87 ),
74 # HTTP access log dates
88 # HTTP access log dates
75 (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "(GET|PUT|POST)',
89 (br' - - \[\d\d/.../2\d\d\d \d\d:\d\d:\d\d] "(GET|PUT|POST)',
76 lambda m: br' - - [$LOGDATE$] "' + m.group(1)
90 lambda m: br' - - [$LOGDATE$] "' + m.group(1)
@@ -120,7 +120,7 b' Failure on subsequent HTTP request on th'
120 write(41) -> Content-Type: application/mercurial-0.1\r\n
120 write(41) -> Content-Type: application/mercurial-0.1\r\n
121 write(21) -> Content-Length: 436\r\n
121 write(21) -> Content-Length: 436\r\n
122 write(2) -> \r\n
122 write(2) -> \r\n
123 write(436) -> batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
123 write(436) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
124 readline(4? from 65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n (glob)
124 readline(4? from 65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n (glob)
125 readline(1? from -1) -> (1?) Accept-Encoding* (glob)
125 readline(1? from -1) -> (1?) Accept-Encoding* (glob)
126 read limit reached; closing socket
126 read limit reached; closing socket
@@ -161,7 +161,7 b' Failure to read getbundle HTTP request'
161 write(41) -> Content-Type: application/mercurial-0.1\r\n
161 write(41) -> Content-Type: application/mercurial-0.1\r\n
162 write(21) -> Content-Length: 436\r\n
162 write(21) -> Content-Length: 436\r\n
163 write(2) -> \r\n
163 write(2) -> \r\n
164 write(436) -> batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
164 write(436) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
165 readline(13? from 65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n (glob)
165 readline(13? from 65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n (glob)
166 readline(1?? from -1) -> (27) Accept-Encoding: identity\r\n (glob)
166 readline(1?? from -1) -> (27) Accept-Encoding: identity\r\n (glob)
167 readline(8? from -1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n (glob)
167 readline(8? from -1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n (glob)
@@ -218,7 +218,7 b' Now do a variation using POST to send ar'
218 write(41) -> Content-Type: application/mercurial-0.1\r\n
218 write(41) -> Content-Type: application/mercurial-0.1\r\n
219 write(21) -> Content-Length: 449\r\n
219 write(21) -> Content-Length: 449\r\n
220 write(2) -> \r\n
220 write(2) -> \r\n
221 write(449) -> batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
221 write(449) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
222 readline(1?? from 65537) -> (27) POST /?cmd=batch HTTP/1.1\r\n (glob)
222 readline(1?? from 65537) -> (27) POST /?cmd=batch HTTP/1.1\r\n (glob)
223 readline(1?? from -1) -> (27) Accept-Encoding: identity\r\n (glob)
223 readline(1?? from -1) -> (27) Accept-Encoding: identity\r\n (glob)
224 readline(1?? from -1) -> (41) content-type: application/mercurial-0.1\r\n (glob)
224 readline(1?? from -1) -> (41) content-type: application/mercurial-0.1\r\n (glob)
@@ -329,7 +329,7 b' TODO this output is horrible'
329 write(41 from 41) -> (577) Content-Type: application/mercurial-0.1\r\n
329 write(41 from 41) -> (577) Content-Type: application/mercurial-0.1\r\n
330 write(21 from 21) -> (556) Content-Length: 436\r\n
330 write(21 from 21) -> (556) Content-Length: 436\r\n
331 write(2 from 2) -> (554) \r\n
331 write(2 from 2) -> (554) \r\n
332 write(436 from 436) -> (118) batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
332 write(436 from 436) -> (118) batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
333 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
333 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
334 readline(-1) -> (27) Accept-Encoding: identity\r\n
334 readline(-1) -> (27) Accept-Encoding: identity\r\n
335 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
335 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
@@ -377,7 +377,7 b' TODO client spews a stack due to uncaugh'
377 write(41 from 41) -> (642) Content-Type: application/mercurial-0.1\r\n
377 write(41 from 41) -> (642) Content-Type: application/mercurial-0.1\r\n
378 write(21 from 21) -> (621) Content-Length: 436\r\n
378 write(21 from 21) -> (621) Content-Length: 436\r\n
379 write(2 from 2) -> (619) \r\n
379 write(2 from 2) -> (619) \r\n
380 write(436 from 436) -> (183) batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
380 write(436 from 436) -> (183) batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
381 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
381 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
382 readline(-1) -> (27) Accept-Encoding: identity\r\n
382 readline(-1) -> (27) Accept-Encoding: identity\r\n
383 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
383 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
@@ -429,7 +429,7 b' TODO this output is terrible'
429 write(41 from 41) -> (789) Content-Type: application/mercurial-0.1\r\n
429 write(41 from 41) -> (789) Content-Type: application/mercurial-0.1\r\n
430 write(21 from 21) -> (768) Content-Length: 436\r\n
430 write(21 from 21) -> (768) Content-Length: 436\r\n
431 write(2 from 2) -> (766) \r\n
431 write(2 from 2) -> (766) \r\n
432 write(436 from 436) -> (330) batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
432 write(436 from 436) -> (330) batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
433 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
433 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
434 readline(-1) -> (27) Accept-Encoding: identity\r\n
434 readline(-1) -> (27) Accept-Encoding: identity\r\n
435 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
435 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
@@ -490,7 +490,7 b' Server sends empty HTTP body for getbund'
490 write(41 from 41) -> (827) Content-Type: application/mercurial-0.1\r\n
490 write(41 from 41) -> (827) Content-Type: application/mercurial-0.1\r\n
491 write(21 from 21) -> (806) Content-Length: 436\r\n
491 write(21 from 21) -> (806) Content-Length: 436\r\n
492 write(2 from 2) -> (804) \r\n
492 write(2 from 2) -> (804) \r\n
493 write(436 from 436) -> (368) batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
493 write(436 from 436) -> (368) batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
494 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
494 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
495 readline(-1) -> (27) Accept-Encoding: identity\r\n
495 readline(-1) -> (27) Accept-Encoding: identity\r\n
496 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
496 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
@@ -553,7 +553,7 b' Server sends partial compression string'
553 write(41 from 41) -> (851) Content-Type: application/mercurial-0.1\r\n
553 write(41 from 41) -> (851) Content-Type: application/mercurial-0.1\r\n
554 write(21 from 21) -> (830) Content-Length: 436\r\n
554 write(21 from 21) -> (830) Content-Length: 436\r\n
555 write(2 from 2) -> (828) \r\n
555 write(2 from 2) -> (828) \r\n
556 write(436 from 436) -> (392) batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
556 write(436 from 436) -> (392) batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
557 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
557 readline(65537) -> (26) GET /?cmd=batch HTTP/1.1\r\n
558 readline(-1) -> (27) Accept-Encoding: identity\r\n
558 readline(-1) -> (27) Accept-Encoding: identity\r\n
559 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
559 readline(-1) -> (29) vary: X-HgArg-1,X-HgProto-1\r\n
General Comments 0
You need to be logged in to leave comments. Login now