Show More
@@ -523,7 +523,11 b' class sshv1peer(wireproto.wirepeer):' | |||||
523 | self._abort(error.ResponseError(_("unexpected response:"), l)) |
|
523 | self._abort(error.ResponseError(_("unexpected response:"), l)) | |
524 |
|
524 | |||
525 | def _readframed(self): |
|
525 | def _readframed(self): | |
526 |
|
|
526 | size = self._getamount() | |
|
527 | if not size: | |||
|
528 | return b'' | |||
|
529 | ||||
|
530 | return self._pipei.read(size) | |||
527 |
|
531 | |||
528 | def _writeframed(self, data, flush=False): |
|
532 | def _writeframed(self, data, flush=False): | |
529 | self._pipeo.write("%d\n" % len(data)) |
|
533 | self._pipeo.write("%d\n" % len(data)) |
@@ -88,7 +88,6 b' Test pushing bundle1 payload to a server' | |||||
88 | i> flush() -> None |
|
88 | i> flush() -> None | |
89 | o> readline() -> 2: |
|
89 | o> readline() -> 2: | |
90 | o> 0\n |
|
90 | o> 0\n | |
91 | o> read(0) -> 0: |
|
|||
92 | o> readline() -> 2: |
|
91 | o> readline() -> 2: | |
93 | o> 1\n |
|
92 | o> 1\n | |
94 | o> read(1) -> 1: 0 |
|
93 | o> read(1) -> 1: 0 | |
@@ -139,7 +138,6 b' Test pushing bundle1 payload to a server' | |||||
139 | i> flush() -> None |
|
138 | i> flush() -> None | |
140 | o> readline() -> 2: |
|
139 | o> readline() -> 2: | |
141 | o> 0\n |
|
140 | o> 0\n | |
142 | o> read(0) -> 0: |
|
|||
143 | o> readline() -> 2: |
|
141 | o> readline() -> 2: | |
144 | o> 1\n |
|
142 | o> 1\n | |
145 | o> read(1) -> 1: 0 |
|
143 | o> read(1) -> 1: 0 | |
@@ -257,7 +255,6 b' ui.write() in hook is redirected to stde' | |||||
257 | i> flush() -> None |
|
255 | i> flush() -> None | |
258 | o> readline() -> 2: |
|
256 | o> readline() -> 2: | |
259 | o> 0\n |
|
257 | o> 0\n | |
260 | o> read(0) -> 0: |
|
|||
261 | o> readline() -> 2: |
|
258 | o> readline() -> 2: | |
262 | o> 1\n |
|
259 | o> 1\n | |
263 | o> read(1) -> 1: 0 |
|
260 | o> read(1) -> 1: 0 | |
@@ -314,7 +311,6 b' ui.write() in hook is redirected to stde' | |||||
314 | i> flush() -> None |
|
311 | i> flush() -> None | |
315 | o> readline() -> 2: |
|
312 | o> readline() -> 2: | |
316 | o> 0\n |
|
313 | o> 0\n | |
317 | o> read(0) -> 0: |
|
|||
318 | o> readline() -> 2: |
|
314 | o> readline() -> 2: | |
319 | o> 1\n |
|
315 | o> 1\n | |
320 | o> read(1) -> 1: 0 |
|
316 | o> read(1) -> 1: 0 | |
@@ -385,7 +381,6 b' And a variation that writes multiple lin' | |||||
385 | i> flush() -> None |
|
381 | i> flush() -> None | |
386 | o> readline() -> 2: |
|
382 | o> readline() -> 2: | |
387 | o> 0\n |
|
383 | o> 0\n | |
388 | o> read(0) -> 0: |
|
|||
389 | o> readline() -> 2: |
|
384 | o> readline() -> 2: | |
390 | o> 1\n |
|
385 | o> 1\n | |
391 | o> read(1) -> 1: 0 |
|
386 | o> read(1) -> 1: 0 | |
@@ -443,7 +438,6 b' And a variation that writes multiple lin' | |||||
443 | i> flush() -> None |
|
438 | i> flush() -> None | |
444 | o> readline() -> 2: |
|
439 | o> readline() -> 2: | |
445 | o> 0\n |
|
440 | o> 0\n | |
446 | o> read(0) -> 0: |
|
|||
447 | o> readline() -> 2: |
|
441 | o> readline() -> 2: | |
448 | o> 1\n |
|
442 | o> 1\n | |
449 | o> read(1) -> 1: 0 |
|
443 | o> read(1) -> 1: 0 | |
@@ -515,7 +509,6 b' And a variation that does a ui.flush() a' | |||||
515 | i> flush() -> None |
|
509 | i> flush() -> None | |
516 | o> readline() -> 2: |
|
510 | o> readline() -> 2: | |
517 | o> 0\n |
|
511 | o> 0\n | |
518 | o> read(0) -> 0: |
|
|||
519 | o> readline() -> 2: |
|
512 | o> readline() -> 2: | |
520 | o> 1\n |
|
513 | o> 1\n | |
521 | o> read(1) -> 1: 0 |
|
514 | o> read(1) -> 1: 0 | |
@@ -572,7 +565,6 b' And a variation that does a ui.flush() a' | |||||
572 | i> flush() -> None |
|
565 | i> flush() -> None | |
573 | o> readline() -> 2: |
|
566 | o> readline() -> 2: | |
574 | o> 0\n |
|
567 | o> 0\n | |
575 | o> read(0) -> 0: |
|
|||
576 | o> readline() -> 2: |
|
568 | o> readline() -> 2: | |
577 | o> 1\n |
|
569 | o> 1\n | |
578 | o> read(1) -> 1: 0 |
|
570 | o> read(1) -> 1: 0 | |
@@ -643,7 +635,6 b' Multiple writes + flush' | |||||
643 | i> flush() -> None |
|
635 | i> flush() -> None | |
644 | o> readline() -> 2: |
|
636 | o> readline() -> 2: | |
645 | o> 0\n |
|
637 | o> 0\n | |
646 | o> read(0) -> 0: |
|
|||
647 | o> readline() -> 2: |
|
638 | o> readline() -> 2: | |
648 | o> 1\n |
|
639 | o> 1\n | |
649 | o> read(1) -> 1: 0 |
|
640 | o> read(1) -> 1: 0 | |
@@ -701,7 +692,6 b' Multiple writes + flush' | |||||
701 | i> flush() -> None |
|
692 | i> flush() -> None | |
702 | o> readline() -> 2: |
|
693 | o> readline() -> 2: | |
703 | o> 0\n |
|
694 | o> 0\n | |
704 | o> read(0) -> 0: |
|
|||
705 | o> readline() -> 2: |
|
695 | o> readline() -> 2: | |
706 | o> 1\n |
|
696 | o> 1\n | |
707 | o> read(1) -> 1: 0 |
|
697 | o> read(1) -> 1: 0 | |
@@ -773,7 +763,6 b' ui.write() + ui.write_err() output is ca' | |||||
773 | i> flush() -> None |
|
763 | i> flush() -> None | |
774 | o> readline() -> 2: |
|
764 | o> readline() -> 2: | |
775 | o> 0\n |
|
765 | o> 0\n | |
776 | o> read(0) -> 0: |
|
|||
777 | o> readline() -> 2: |
|
766 | o> readline() -> 2: | |
778 | o> 1\n |
|
767 | o> 1\n | |
779 | o> read(1) -> 1: 0 |
|
768 | o> read(1) -> 1: 0 | |
@@ -833,7 +822,6 b' ui.write() + ui.write_err() output is ca' | |||||
833 | i> flush() -> None |
|
822 | i> flush() -> None | |
834 | o> readline() -> 2: |
|
823 | o> readline() -> 2: | |
835 | o> 0\n |
|
824 | o> 0\n | |
836 | o> read(0) -> 0: |
|
|||
837 | o> readline() -> 2: |
|
825 | o> readline() -> 2: | |
838 | o> 1\n |
|
826 | o> 1\n | |
839 | o> read(1) -> 1: 0 |
|
827 | o> read(1) -> 1: 0 | |
@@ -907,7 +895,6 b' print() output is captured' | |||||
907 | i> flush() -> None |
|
895 | i> flush() -> None | |
908 | o> readline() -> 2: |
|
896 | o> readline() -> 2: | |
909 | o> 0\n |
|
897 | o> 0\n | |
910 | o> read(0) -> 0: |
|
|||
911 | o> readline() -> 2: |
|
898 | o> readline() -> 2: | |
912 | o> 1\n |
|
899 | o> 1\n | |
913 | o> read(1) -> 1: 0 |
|
900 | o> read(1) -> 1: 0 | |
@@ -964,7 +951,6 b' print() output is captured' | |||||
964 | i> flush() -> None |
|
951 | i> flush() -> None | |
965 | o> readline() -> 2: |
|
952 | o> readline() -> 2: | |
966 | o> 0\n |
|
953 | o> 0\n | |
967 | o> read(0) -> 0: |
|
|||
968 | o> readline() -> 2: |
|
954 | o> readline() -> 2: | |
969 | o> 1\n |
|
955 | o> 1\n | |
970 | o> read(1) -> 1: 0 |
|
956 | o> read(1) -> 1: 0 | |
@@ -1035,7 +1021,6 b' Mixed print() and ui.write() are both ca' | |||||
1035 | i> flush() -> None |
|
1021 | i> flush() -> None | |
1036 | o> readline() -> 2: |
|
1022 | o> readline() -> 2: | |
1037 | o> 0\n |
|
1023 | o> 0\n | |
1038 | o> read(0) -> 0: |
|
|||
1039 | o> readline() -> 2: |
|
1024 | o> readline() -> 2: | |
1040 | o> 1\n |
|
1025 | o> 1\n | |
1041 | o> read(1) -> 1: 0 |
|
1026 | o> read(1) -> 1: 0 | |
@@ -1095,7 +1080,6 b' Mixed print() and ui.write() are both ca' | |||||
1095 | i> flush() -> None |
|
1080 | i> flush() -> None | |
1096 | o> readline() -> 2: |
|
1081 | o> readline() -> 2: | |
1097 | o> 0\n |
|
1082 | o> 0\n | |
1098 | o> read(0) -> 0: |
|
|||
1099 | o> readline() -> 2: |
|
1083 | o> readline() -> 2: | |
1100 | o> 1\n |
|
1084 | o> 1\n | |
1101 | o> read(1) -> 1: 0 |
|
1085 | o> read(1) -> 1: 0 | |
@@ -1169,7 +1153,6 b' print() to stdout and stderr both get ca' | |||||
1169 | i> flush() -> None |
|
1153 | i> flush() -> None | |
1170 | o> readline() -> 2: |
|
1154 | o> readline() -> 2: | |
1171 | o> 0\n |
|
1155 | o> 0\n | |
1172 | o> read(0) -> 0: |
|
|||
1173 | o> readline() -> 2: |
|
1156 | o> readline() -> 2: | |
1174 | o> 1\n |
|
1157 | o> 1\n | |
1175 | o> read(1) -> 1: 0 |
|
1158 | o> read(1) -> 1: 0 | |
@@ -1229,7 +1212,6 b' print() to stdout and stderr both get ca' | |||||
1229 | i> flush() -> None |
|
1212 | i> flush() -> None | |
1230 | o> readline() -> 2: |
|
1213 | o> readline() -> 2: | |
1231 | o> 0\n |
|
1214 | o> 0\n | |
1232 | o> read(0) -> 0: |
|
|||
1233 | o> readline() -> 2: |
|
1215 | o> readline() -> 2: | |
1234 | o> 1\n |
|
1216 | o> 1\n | |
1235 | o> read(1) -> 1: 0 |
|
1217 | o> read(1) -> 1: 0 | |
@@ -1309,7 +1291,6 b' Shell hook writing to stdout has output ' | |||||
1309 | i> flush() -> None |
|
1291 | i> flush() -> None | |
1310 | o> readline() -> 2: |
|
1292 | o> readline() -> 2: | |
1311 | o> 0\n |
|
1293 | o> 0\n | |
1312 | o> read(0) -> 0: |
|
|||
1313 | o> readline() -> 2: |
|
1294 | o> readline() -> 2: | |
1314 | o> 1\n |
|
1295 | o> 1\n | |
1315 | o> read(1) -> 1: 0 |
|
1296 | o> read(1) -> 1: 0 | |
@@ -1367,7 +1348,6 b' Shell hook writing to stdout has output ' | |||||
1367 | i> flush() -> None |
|
1348 | i> flush() -> None | |
1368 | o> readline() -> 2: |
|
1349 | o> readline() -> 2: | |
1369 | o> 0\n |
|
1350 | o> 0\n | |
1370 | o> read(0) -> 0: |
|
|||
1371 | o> readline() -> 2: |
|
1351 | o> readline() -> 2: | |
1372 | o> 1\n |
|
1352 | o> 1\n | |
1373 | o> read(1) -> 1: 0 |
|
1353 | o> read(1) -> 1: 0 | |
@@ -1440,7 +1420,6 b' Shell hook writing to stderr has output ' | |||||
1440 | i> flush() -> None |
|
1420 | i> flush() -> None | |
1441 | o> readline() -> 2: |
|
1421 | o> readline() -> 2: | |
1442 | o> 0\n |
|
1422 | o> 0\n | |
1443 | o> read(0) -> 0: |
|
|||
1444 | o> readline() -> 2: |
|
1423 | o> readline() -> 2: | |
1445 | o> 1\n |
|
1424 | o> 1\n | |
1446 | o> read(1) -> 1: 0 |
|
1425 | o> read(1) -> 1: 0 | |
@@ -1498,7 +1477,6 b' Shell hook writing to stderr has output ' | |||||
1498 | i> flush() -> None |
|
1477 | i> flush() -> None | |
1499 | o> readline() -> 2: |
|
1478 | o> readline() -> 2: | |
1500 | o> 0\n |
|
1479 | o> 0\n | |
1501 | o> read(0) -> 0: |
|
|||
1502 | o> readline() -> 2: |
|
1480 | o> readline() -> 2: | |
1503 | o> 1\n |
|
1481 | o> 1\n | |
1504 | o> read(1) -> 1: 0 |
|
1482 | o> read(1) -> 1: 0 | |
@@ -1573,7 +1551,6 b' Shell hook writing to stdout and stderr ' | |||||
1573 | i> flush() -> None |
|
1551 | i> flush() -> None | |
1574 | o> readline() -> 2: |
|
1552 | o> readline() -> 2: | |
1575 | o> 0\n |
|
1553 | o> 0\n | |
1576 | o> read(0) -> 0: |
|
|||
1577 | o> readline() -> 2: |
|
1554 | o> readline() -> 2: | |
1578 | o> 1\n |
|
1555 | o> 1\n | |
1579 | o> read(1) -> 1: 0 |
|
1556 | o> read(1) -> 1: 0 | |
@@ -1633,7 +1610,6 b' Shell hook writing to stdout and stderr ' | |||||
1633 | i> flush() -> None |
|
1610 | i> flush() -> None | |
1634 | o> readline() -> 2: |
|
1611 | o> readline() -> 2: | |
1635 | o> 0\n |
|
1612 | o> 0\n | |
1636 | o> read(0) -> 0: |
|
|||
1637 | o> readline() -> 2: |
|
1613 | o> readline() -> 2: | |
1638 | o> 1\n |
|
1614 | o> 1\n | |
1639 | o> read(1) -> 1: 0 |
|
1615 | o> read(1) -> 1: 0 | |
@@ -1716,7 +1692,6 b' Shell and Python hooks writing to stdout' | |||||
1716 | i> flush() -> None |
|
1692 | i> flush() -> None | |
1717 | o> readline() -> 2: |
|
1693 | o> readline() -> 2: | |
1718 | o> 0\n |
|
1694 | o> 0\n | |
1719 | o> read(0) -> 0: |
|
|||
1720 | o> readline() -> 2: |
|
1695 | o> readline() -> 2: | |
1721 | o> 1\n |
|
1696 | o> 1\n | |
1722 | o> read(1) -> 1: 0 |
|
1697 | o> read(1) -> 1: 0 | |
@@ -1780,7 +1755,6 b' Shell and Python hooks writing to stdout' | |||||
1780 | i> flush() -> None |
|
1755 | i> flush() -> None | |
1781 | o> readline() -> 2: |
|
1756 | o> readline() -> 2: | |
1782 | o> 0\n |
|
1757 | o> 0\n | |
1783 | o> read(0) -> 0: |
|
|||
1784 | o> readline() -> 2: |
|
1758 | o> readline() -> 2: | |
1785 | o> 1\n |
|
1759 | o> 1\n | |
1786 | o> read(1) -> 1: 0 |
|
1760 | o> read(1) -> 1: 0 | |
@@ -1858,7 +1832,6 b' Pushing a bundle1 with no output' | |||||
1858 | i> flush() -> None |
|
1832 | i> flush() -> None | |
1859 | o> readline() -> 2: |
|
1833 | o> readline() -> 2: | |
1860 | o> 0\n |
|
1834 | o> 0\n | |
1861 | o> read(0) -> 0: |
|
|||
1862 | o> readline() -> 2: |
|
1835 | o> readline() -> 2: | |
1863 | o> 1\n |
|
1836 | o> 1\n | |
1864 | o> read(1) -> 1: 1 |
|
1837 | o> read(1) -> 1: 1 | |
@@ -1911,7 +1884,6 b' Pushing a bundle1 with no output' | |||||
1911 | i> flush() -> None |
|
1884 | i> flush() -> None | |
1912 | o> readline() -> 2: |
|
1885 | o> readline() -> 2: | |
1913 | o> 0\n |
|
1886 | o> 0\n | |
1914 | o> read(0) -> 0: |
|
|||
1915 | o> readline() -> 2: |
|
1887 | o> readline() -> 2: | |
1916 | o> 1\n |
|
1888 | o> 1\n | |
1917 | o> read(1) -> 1: 1 |
|
1889 | o> read(1) -> 1: 1 | |
@@ -1990,7 +1962,6 b' Pushing a bundle1 with ui.write() and ui' | |||||
1990 | i> flush() -> None |
|
1962 | i> flush() -> None | |
1991 | o> readline() -> 2: |
|
1963 | o> readline() -> 2: | |
1992 | o> 0\n |
|
1964 | o> 0\n | |
1993 | o> read(0) -> 0: |
|
|||
1994 | o> readline() -> 2: |
|
1965 | o> readline() -> 2: | |
1995 | o> 1\n |
|
1966 | o> 1\n | |
1996 | o> read(1) -> 1: 1 |
|
1967 | o> read(1) -> 1: 1 | |
@@ -2047,7 +2018,6 b' Pushing a bundle1 with ui.write() and ui' | |||||
2047 | i> flush() -> None |
|
2018 | i> flush() -> None | |
2048 | o> readline() -> 2: |
|
2019 | o> readline() -> 2: | |
2049 | o> 0\n |
|
2020 | o> 0\n | |
2050 | o> read(0) -> 0: |
|
|||
2051 | o> readline() -> 2: |
|
2021 | o> readline() -> 2: | |
2052 | o> 1\n |
|
2022 | o> 1\n | |
2053 | o> read(1) -> 1: 1 |
|
2023 | o> read(1) -> 1: 1 |
General Comments 0
You need to be logged in to leave comments.
Login now