From 0649ad405afb3d0642bcd5c753f30970aab97743 Mon Sep 17 00:00:00 2001 From: "cao.yuan" Date: Tue, 26 Feb 2019 10:10:48 +0800 Subject: [PATCH] Update json module to jsonutils oslo project provide jsonutils, and qinlingclient use it in many place[1], this PS to update the remained json module to oslo jsonutils for consistency. [1]: https://github.com/openstack/python-qinlingclient/search?utf8=%E2%9C%93&q=jsonutils&type= Change-Id: I16cb1e688f0b237d270acb6751e78d6b4a5d01ba --- qinlingclient/tests/unit/v1/test_function.py | 11 ++++++----- qinlingclient/tests/unit/v1/test_function_alias.py | 9 +++++---- .../tests/unit/v1/test_function_execution.py | 7 ++++--- qinlingclient/tests/unit/v1/test_function_version.py | 7 ++++--- qinlingclient/tests/unit/v1/test_job.py | 9 +++++---- qinlingclient/tests/unit/v1/test_runtime.py | 7 ++++--- qinlingclient/tests/unit/v1/test_webhook.py | 9 +++++---- 7 files changed, 33 insertions(+), 26 deletions(-) diff --git a/qinlingclient/tests/unit/v1/test_function.py b/qinlingclient/tests/unit/v1/test_function.py index 7c6835e..ba5ffb0 100644 --- a/qinlingclient/tests/unit/v1/test_function.py +++ b/qinlingclient/tests/unit/v1/test_function.py @@ -12,11 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import six from six.moves.urllib.parse import urlencode import uuid +from oslo_serialization import jsonutils + from qinlingclient.common import exceptions from qinlingclient.tests.unit.v1 import test_client @@ -63,7 +64,7 @@ class TestFunction(test_client.TestQinlingClient): def test_create_function(self): runtime_id = 'runtime_id' code = {'source': 'package', 'md5sum': 'MD5SUM'} - data = {'runtime_id': runtime_id, 'code': json.dumps(code)} + data = {'runtime_id': runtime_id, 'code': jsonutils.dumps(code)} self.requests_mock.register_uri( 'POST', test_client.QINLING_URL + '/v1/functions', @@ -82,7 +83,7 @@ class TestFunction(test_client.TestQinlingClient): package = six.StringIO(package_content) cpu = '100' memory_size = '33554432' - data = {'runtime_id': runtime_id, 'code': json.dumps(code), + data = {'runtime_id': runtime_id, 'code': jsonutils.dumps(code), 'cpu': cpu, 'memory_size': memory_size} self.requests_mock.register_uri( @@ -299,7 +300,7 @@ class TestFunction(test_client.TestQinlingClient): resp, text = self.client.functions.scaleup(function_id) self.assertEqual('', text) self.assertEqual(202, resp.status_code) - self.assertEqual(json.dumps({'count': 1}), + self.assertEqual(jsonutils.dumps({'count': 1}), self.requests_mock.last_request.text) def test_scaleup_function_error(self): @@ -329,7 +330,7 @@ class TestFunction(test_client.TestQinlingClient): resp, text = self.client.functions.scaledown(function_id, count=2) self.assertEqual('', text) self.assertEqual(202, resp.status_code) - self.assertEqual(json.dumps({'count': 2}), + self.assertEqual(jsonutils.dumps({'count': 2}), self.requests_mock.last_request.text) def test_scaledown_function_error(self): diff --git a/qinlingclient/tests/unit/v1/test_function_alias.py b/qinlingclient/tests/unit/v1/test_function_alias.py index 70bcedc..8e8a812 100644 --- a/qinlingclient/tests/unit/v1/test_function_alias.py +++ b/qinlingclient/tests/unit/v1/test_function_alias.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import uuid +from oslo_serialization import jsonutils + from qinlingclient.common import exceptions from qinlingclient.tests.unit.v1 import test_client @@ -58,7 +59,7 @@ class TestFunctionAlias(test_client.TestQinlingClient): ) ret = self.client.function_aliases.create(name, function_id) self.assertEqual(ALIAS_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_function_alias_all_options(self): @@ -81,7 +82,7 @@ class TestFunctionAlias(test_client.TestQinlingClient): description=description ) self.assertEqual(ALIAS_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_function_alias_error(self): @@ -186,7 +187,7 @@ class TestFunctionAlias(test_client.TestQinlingClient): description=description ) self.assertEqual(ALIAS_2, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_update_function_alias_error(self): diff --git a/qinlingclient/tests/unit/v1/test_function_execution.py b/qinlingclient/tests/unit/v1/test_function_execution.py index 48df21f..3aa984d 100644 --- a/qinlingclient/tests/unit/v1/test_function_execution.py +++ b/qinlingclient/tests/unit/v1/test_function_execution.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import uuid +from oslo_serialization import jsonutils + from qinlingclient.common import exceptions from qinlingclient.tests.unit.v1 import test_client @@ -72,7 +73,7 @@ class TestFunctionExecution(test_client.TestQinlingClient): ) ret = self.client.function_executions.create(function_id) self.assertEqual(EXECUTION_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_function_execution_all_options(self): @@ -94,7 +95,7 @@ class TestFunctionExecution(test_client.TestQinlingClient): function_id, version=function_version, sync=sync, input=function_input) self.assertEqual(EXECUTION_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_function_execution_error(self): diff --git a/qinlingclient/tests/unit/v1/test_function_version.py b/qinlingclient/tests/unit/v1/test_function_version.py index e9e4b7b..2941c8f 100644 --- a/qinlingclient/tests/unit/v1/test_function_version.py +++ b/qinlingclient/tests/unit/v1/test_function_version.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import uuid +from oslo_serialization import jsonutils + from qinlingclient.common import exceptions from qinlingclient.tests.unit.v1 import test_client @@ -61,7 +62,7 @@ class TestFunctionVersion(test_client.TestQinlingClient): ) ret = self.client.function_versions.create(function_id) self.assertEqual(VERSION_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_function_version_all_options(self): @@ -78,7 +79,7 @@ class TestFunctionVersion(test_client.TestQinlingClient): ret = self.client.function_versions.create( function_id, description=description) self.assertEqual(VERSION_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_function_version_error(self): diff --git a/qinlingclient/tests/unit/v1/test_job.py b/qinlingclient/tests/unit/v1/test_job.py index e0d1314..1c62f40 100644 --- a/qinlingclient/tests/unit/v1/test_job.py +++ b/qinlingclient/tests/unit/v1/test_job.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import uuid +from oslo_serialization import jsonutils + from qinlingclient.common import exceptions from qinlingclient.tests.unit.v1 import test_client @@ -61,7 +62,7 @@ class TestJob(test_client.TestQinlingClient): ) ret = self.client.jobs.create(function_id) self.assertEqual(JOB_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_job_all_options(self): @@ -91,7 +92,7 @@ class TestJob(test_client.TestQinlingClient): first_execution_time=first_execution_time, pattern=pattern, function_input=function_input, count=count) self.assertEqual(JOB_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_job_error(self): @@ -188,7 +189,7 @@ class TestJob(test_client.TestQinlingClient): ) ret = self.client.jobs.update(job_id, name=name, pattern=pattern) self.assertEqual(JOB_2, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_update_job_error(self): diff --git a/qinlingclient/tests/unit/v1/test_runtime.py b/qinlingclient/tests/unit/v1/test_runtime.py index 201e8d7..f78cea7 100644 --- a/qinlingclient/tests/unit/v1/test_runtime.py +++ b/qinlingclient/tests/unit/v1/test_runtime.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import uuid +from oslo_serialization import jsonutils + from qinlingclient.common import exceptions from qinlingclient.tests.unit.v1 import test_client @@ -62,7 +63,7 @@ class TestRuntime(test_client.TestQinlingClient): self.assertEqual(RUNTIME_1, ret.to_dict()) self.assertEqual(request_data, - json.loads(self.requests_mock.last_request.text)) + jsonutils.loads(self.requests_mock.last_request.text)) def test_create_runtime_all_options(self): image_name = 'image_name' @@ -87,7 +88,7 @@ class TestRuntime(test_client.TestQinlingClient): self.assertEqual(RUNTIME_1, ret.to_dict()) self.assertEqual(request_data, - json.loads(self.requests_mock.last_request.text)) + jsonutils.loads(self.requests_mock.last_request.text)) def test_create_runtime_error(self): self.requests_mock.register_uri( diff --git a/qinlingclient/tests/unit/v1/test_webhook.py b/qinlingclient/tests/unit/v1/test_webhook.py index 87d6be2..4edfb0f 100644 --- a/qinlingclient/tests/unit/v1/test_webhook.py +++ b/qinlingclient/tests/unit/v1/test_webhook.py @@ -12,9 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import json import uuid +from oslo_serialization import jsonutils + from qinlingclient.common import exceptions from qinlingclient.tests.unit.v1 import test_client @@ -70,7 +71,7 @@ class TestWebhook(test_client.TestQinlingClient): ) ret = self.client.webhooks.create(function_id) self.assertEqual(WEBHOOK_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_webhook_all_options(self): @@ -92,7 +93,7 @@ class TestWebhook(test_client.TestQinlingClient): function_id, function_version=function_version, description=description) self.assertEqual(WEBHOOK_1, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_create_webhook_error(self): @@ -191,7 +192,7 @@ class TestWebhook(test_client.TestQinlingClient): function_id=function_id, description=description) self.assertEqual(WEBHOOK_2, ret.to_dict()) - self.assertEqual(json.dumps(request_data), + self.assertEqual(jsonutils.dumps(request_data), self.requests_mock.last_request.text) def test_update_webhook_error(self):