( )⚙ D3334 wireprotoframing: record when new stream is encountered

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3334

wireprotoframing: record when new stream is encountered
ClosedPublic

Authored by indygreg on Apr 13 2018, 5:36 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGe6870bca1f47: wireprotoframing: record when new stream is encountered
Summary

Without this, we choke after receiving the 2nd frame in a stream.
Not sure how we made it this far without finding this bug.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Apr 13 2018, 5:36 PM
durin42 accepted this revision.Apr 13 2018, 6:07 PM
This revision is now accepted and ready to land.Apr 13 2018, 6:07 PM
Closed by commit rHGe6870bca1f47: wireprotoframing: record when new stream is encountered (authored by indygreg). · Explain WhyApr 13 2018, 6:21 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 8157

mercurial/wireprotoframing.py

if frame.streamid not in self._incomingstreams: if frame.streamid not in self._incomingstreams:
if not frame.streamflags & STREAM_FLAG_BEGIN_STREAM: if not frame.streamflags & STREAM_FLAG_BEGIN_STREAM:
return 'error', { return 'error', {
'message': _('received frame on unknown stream ' 'message': _('received frame on unknown stream '
'without beginning of stream flag set'), 'without beginning of stream flag set'),
} }
self._incomingstreams[frame.streamid] = stream(frame.streamid)
if frame.streamflags & STREAM_FLAG_ENCODING_APPLIED: if frame.streamflags & STREAM_FLAG_ENCODING_APPLIED:
raise error.ProgrammingError('support for decoding stream ' raise error.ProgrammingError('support for decoding stream '
'payloads not yet implemneted') 'payloads not yet implemneted')
if frame.streamflags & STREAM_FLAG_END_STREAM: if frame.streamflags & STREAM_FLAG_END_STREAM:
del self._incomingstreams[frame.streamid] del self._incomingstreams[frame.streamid]
if frame.requestid not in self._activerequests: if frame.requestid not in self._activerequests:

tests/test-wireproto-clientreactor.py

request, action, meta = reactor.callcommand(b'foo', {}) request, action, meta = reactor.callcommand(b'foo', {})
for frame in meta['framegen']: for frame in meta['framegen']:
pass pass
with self.assertRaisesRegexp(error.ProgrammingError, with self.assertRaisesRegexp(error.ProgrammingError,
'unhandled frame type'): 'unhandled frame type'):
sendframe(reactor, ffs(b'1 0 stream-begin text-output 0 foo')) sendframe(reactor, ffs(b'1 0 stream-begin text-output 0 foo'))
class StreamTests(unittest.TestCase):
def testmultipleresponseframes(self):
reactor = framing.clientreactor(buffersends=False)
request, action, meta = reactor.callcommand(b'foo', {})
self.assertEqual(action, 'sendframes')
for f in meta['framegen']:
pass
action, meta = sendframe(
reactor,
ffs(b'%d 0 stream-begin 4 0 foo' % request.requestid))
self.assertEqual(action, 'responsedata')
action, meta = sendframe(
reactor,
ffs(b'%d 0 0 4 eos bar' % request.requestid))
self.assertEqual(action, 'responsedata')
if __name__ == '__main__': if __name__ == '__main__':
import silenttestrunner import silenttestrunner
silenttestrunner.main(__name__) silenttestrunner.main(__name__)