| durin42 |
| hg-reviewers |
There were two "testconflictingrequestid" methods. Naturally this isn't
an error in Python. And by our luck, the test was failing.
So we rename the test and fix it to pass.
As part of this, _sendsingleframe() now takes a frame, not a string
describing the frame. This is better because action at a distance can
be confusing.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | tests/test-wireproto-serverreactor.py (35 lines) |
| (b'foo %s', [b'arg'], [b'label']), | (b'foo %s', [b'arg'], [b'label']), | ||||
| ])) | ])) | ||||
| self.assertEqual(val, [ | self.assertEqual(val, [ | ||||
| ffs(br'1 text-output 0 \x06\x00\x01\x01\x05\x03\x00foo %slabelarg'), | ffs(br'1 text-output 0 \x06\x00\x01\x01\x05\x03\x00foo %slabelarg'), | ||||
| ]) | ]) | ||||
| class ServerReactorTests(unittest.TestCase): | class ServerReactorTests(unittest.TestCase): | ||||
| def _sendsingleframe(self, reactor, s): | def _sendsingleframe(self, reactor, f): | ||||
| results = list(sendframes(reactor, [ffs(s)])) | results = list(sendframes(reactor, [f])) | ||||
| self.assertEqual(len(results), 1) | self.assertEqual(len(results), 1) | ||||
| return results[0] | return results[0] | ||||
| def assertaction(self, res, expected): | def assertaction(self, res, expected): | ||||
| self.assertIsInstance(res, tuple) | self.assertIsInstance(res, tuple) | ||||
| self.assertEqual(len(res), 2) | self.assertEqual(len(res), 2) | ||||
| self.assertIsInstance(res[1], dict) | self.assertIsInstance(res[1], dict) | ||||
| b'foo': b'bar', | b'foo': b'bar', | ||||
| }, | }, | ||||
| 'data': b'value1value2', | 'data': b'value1value2', | ||||
| }) | }) | ||||
| def testunexpectedcommandargument(self): | def testunexpectedcommandargument(self): | ||||
| """Command argument frame when not running a command is an error.""" | """Command argument frame when not running a command is an error.""" | ||||
| result = self._sendsingleframe(makereactor(), | result = self._sendsingleframe(makereactor(), | ||||
| b'1 command-argument 0 ignored') | ffs(b'1 command-argument 0 ignored')) | ||||
| self.assertaction(result, 'error') | self.assertaction(result, 'error') | ||||
| self.assertEqual(result[1], { | self.assertEqual(result[1], { | ||||
| 'message': b'expected command frame; got 2', | 'message': b'expected command frame; got 2', | ||||
| }) | }) | ||||
| def testunexpectedcommandargumentreceiving(self): | def testunexpectedcommandargumentreceiving(self): | ||||
| """Same as above but the command is receiving.""" | """Same as above but the command is receiving.""" | ||||
| results = list(sendframes(makereactor(), [ | results = list(sendframes(makereactor(), [ | ||||
| ffs(b'1 command-name have-data command'), | ffs(b'1 command-name have-data command'), | ||||
| ffs(b'1 command-argument eoa ignored'), | ffs(b'1 command-argument eoa ignored'), | ||||
| ])) | ])) | ||||
| self.assertaction(results[1], 'error') | self.assertaction(results[1], 'error') | ||||
| self.assertEqual(results[1][1], { | self.assertEqual(results[1][1], { | ||||
| 'message': b'received command argument frame for request that is ' | 'message': b'received command argument frame for request that is ' | ||||
| b'not expecting arguments: 1', | b'not expecting arguments: 1', | ||||
| }) | }) | ||||
| def testunexpectedcommanddata(self): | def testunexpectedcommanddata(self): | ||||
| """Command argument frame when not running a command is an error.""" | """Command argument frame when not running a command is an error.""" | ||||
| result = self._sendsingleframe(makereactor(), | result = self._sendsingleframe(makereactor(), | ||||
| b'1 command-data 0 ignored') | ffs(b'1 command-data 0 ignored')) | ||||
| self.assertaction(result, 'error') | self.assertaction(result, 'error') | ||||
| self.assertEqual(result[1], { | self.assertEqual(result[1], { | ||||
| 'message': b'expected command frame; got 3', | 'message': b'expected command frame; got 3', | ||||
| }) | }) | ||||
| def testunexpectedcommanddatareceiving(self): | def testunexpectedcommanddatareceiving(self): | ||||
| """Same as above except the command is receiving.""" | """Same as above except the command is receiving.""" | ||||
| results = list(sendframes(makereactor(), [ | results = list(sendframes(makereactor(), [ | ||||
| ffs(b'1 command-name have-args command'), | ffs(b'1 command-name have-args command'), | ||||
| ffs(b'1 command-data eos ignored'), | ffs(b'1 command-data eos ignored'), | ||||
| ])) | ])) | ||||
| self.assertaction(results[1], 'error') | self.assertaction(results[1], 'error') | ||||
| self.assertEqual(results[1][1], { | self.assertEqual(results[1][1], { | ||||
| 'message': b'received command data frame for request that is not ' | 'message': b'received command data frame for request that is not ' | ||||
| b'expecting data: 1', | b'expecting data: 1', | ||||
| }) | }) | ||||
| def testmissingcommandframeflags(self): | def testmissingcommandframeflags(self): | ||||
| """Command name frame must have flags set.""" | """Command name frame must have flags set.""" | ||||
| result = self._sendsingleframe(makereactor(), | result = self._sendsingleframe(makereactor(), | ||||
| b'1 command-name 0 command') | ffs(b'1 command-name 0 command')) | ||||
| self.assertaction(result, 'error') | self.assertaction(result, 'error') | ||||
| self.assertEqual(result[1], { | self.assertEqual(result[1], { | ||||
| 'message': b'missing frame flags on command frame', | 'message': b'missing frame flags on command frame', | ||||
| }) | }) | ||||
| def testconflictingrequestid(self): | def testconflictingrequestidallowed(self): | ||||
| """Multiple fully serviced commands with same request ID is allowed.""" | """Multiple fully serviced commands with same request ID is allowed.""" | ||||
| results = list(sendframes(makereactor(), [ | reactor = makereactor() | ||||
| ffs(b'1 command-name eos command'), | results = [] | ||||
| ffs(b'1 command-name eos command'), | results.append(self._sendsingleframe( | ||||
| ffs(b'1 command-name eos command'), | reactor, ffs(b'1 command-name eos command'))) | ||||
| ])) | result = reactor.onbytesresponseready(1, b'response1') | ||||
| self.assertaction(result, 'sendframes') | |||||
| list(result[1]['framegen']) | |||||
| results.append(self._sendsingleframe( | |||||
| reactor, ffs(b'1 command-name eos command'))) | |||||
| result = reactor.onbytesresponseready(1, b'response2') | |||||
| self.assertaction(result, 'sendframes') | |||||
| list(result[1]['framegen']) | |||||
| results.append(self._sendsingleframe( | |||||
| reactor, ffs(b'1 command-name eos command'))) | |||||
| result = reactor.onbytesresponseready(1, b'response3') | |||||
| self.assertaction(result, 'sendframes') | |||||
| list(result[1]['framegen']) | |||||
| for i in range(3): | for i in range(3): | ||||
| self.assertaction(results[i], 'runcommand') | self.assertaction(results[i], 'runcommand') | ||||
| self.assertEqual(results[i][1], { | self.assertEqual(results[i][1], { | ||||
| 'requestid': 1, | 'requestid': 1, | ||||
| 'command': b'command', | 'command': b'command', | ||||
| 'args': {}, | 'args': {}, | ||||
| 'data': None, | 'data': None, | ||||
| }) | }) | ||||