From 78c95c7daef202eca4680243d37bc7dc26c4ede6 Mon Sep 17 00:00:00 2001 From: Juanjo Alvarez Date: Wed, 31 May 2017 11:27:21 +0200 Subject: [PATCH] Move response metadata into the metadata key Fixed outdated test --- native/python_package/python_driver/requestprocessor.py | 8 +++++--- native/python_package/test/test_python_driver.py | 5 ++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/native/python_package/python_driver/requestprocessor.py b/native/python_package/python_driver/requestprocessor.py index 8e3b3ef6..8d894594 100644 --- a/native/python_package/python_driver/requestprocessor.py +++ b/native/python_package/python_driver/requestprocessor.py @@ -156,10 +156,12 @@ def process_request(self, request: RawRequest) -> None: response = Response({ 'status' : 'ok', 'errors' : self.errors, - 'language' : 'python', - 'language_version' : version, - 'driver' : 'python23:%s' % __version__, 'ast' : ast, + 'metadata' : { + 'language' : 'python', + 'language_version' : version, + 'driver' : 'python23:%s' % __version__, + } }) if filepath: response['filepath'] = filepath diff --git a/native/python_package/test/test_python_driver.py b/native/python_package/test/test_python_driver.py index 7fb66191..b297688a 100644 --- a/native/python_package/test/test_python_driver.py +++ b/native/python_package/test/test_python_driver.py @@ -143,7 +143,6 @@ def _send_receive(self, nummsgs: int, outformat: str='json', def _check_reply_dict(self, response: Response, has_errors: bool=False) -> None: self.assertIsInstance(response, dict) - self.assertEqual(response.get('driver'), 'python23:%s' % __version__) status = response.get('status') if has_errors: @@ -152,10 +151,10 @@ def _check_reply_dict(self, response: Response, has_errors: bool=False) -> None: self.assertIsInstance(errors, list) self.assertGreater(len(errors), 0) else: - self.assertEqual(response.get('language'), 'python') + self.assertEqual(response['metadata']['language'], 'python') self.assertEqual(status, 'ok') self._check_AST_dict(response) - language_version = response.get('language_version', -1) + language_version = response['metadata'].get('language_version', -1) assert str(language_version) in ('2', '3') def _check_AST_dict(self, response: Response) -> None: