From 612f97a36a433a48b690ce2444d3baad45164df7 Mon Sep 17 00:00:00 2001 From: Rosen Sasov Date: Mon, 20 Jan 2020 01:06:10 +0200 Subject: [PATCH] Rename RPC related classes. Fixes #682 --- tcms/management/models.py | 8 ++++---- tcms/rpc/serializer.py | 17 +++++++++-------- tcms/rpc/tests/test_category.py | 4 ++-- tcms/rpc/tests/test_component.py | 8 ++++---- tcms/rpc/tests/test_plantype.py | 4 ++-- tcms/rpc/tests/test_product.py | 4 ++-- tcms/rpc/tests/test_serializer.py | 10 +++++----- tcms/rpc/tests/test_tag.py | 4 ++-- tcms/rpc/tests/test_testbuild.py | 8 ++++---- tcms/rpc/tests/test_testcase.py | 16 ++++++++-------- tcms/rpc/tests/test_testexecution.py | 16 ++++++++-------- tcms/rpc/tests/test_testplan.py | 14 +++++++------- tcms/rpc/tests/test_testrun.py | 14 +++++++------- tcms/rpc/tests/test_user.py | 8 ++++---- tcms/rpc/tests/test_version.py | 6 +++--- tcms/rpc/tests/utils.py | 4 ++-- tcms/testcases/models.py | 10 +++++----- tcms/testplans/models.py | 4 ++-- tcms/testruns/models.py | 13 ++++++------- 19 files changed, 86 insertions(+), 86 deletions(-) diff --git a/tcms/management/models.py b/tcms/management/models.py index 2540d92fe9..ee4b7c7883 100755 --- a/tcms/management/models.py +++ b/tcms/management/models.py @@ -4,8 +4,8 @@ from django.db import models from tcms.core.models import TCMSActionModel -from tcms.rpc.serializer import ProductXMLRPCSerializer -from tcms.rpc.serializer import BuildXMLRPCSerializer +from tcms.rpc.serializer import BuildRPCSerializer +from tcms.rpc.serializer import ProductRPCSerializer class Classification(TCMSActionModel): @@ -32,7 +32,7 @@ def __str__(self): def to_xmlrpc(cls, query=None): _query = query or {} query_set = cls.objects.filter(**_query).order_by('pk') - serializer = ProductXMLRPCSerializer(model_class=cls, queryset=query_set) + serializer = ProductRPCSerializer(model_class=cls, queryset=query_set) return serializer.serialize_queryset() def save(self, force_insert=False, force_update=False, using=None, @@ -132,7 +132,7 @@ class Meta: def to_xmlrpc(cls, query=None): query = query or {} query_set = cls.objects.filter(**query).order_by('pk') - serializer = BuildXMLRPCSerializer(model_class=cls, queryset=query_set) + serializer = BuildRPCSerializer(model_class=cls, queryset=query_set) return serializer.serialize_queryset() def __str__(self): diff --git a/tcms/rpc/serializer.py b/tcms/rpc/serializer.py index 6d8d5f6935..0fadad65b7 100644 --- a/tcms/rpc/serializer.py +++ b/tcms/rpc/serializer.py @@ -11,6 +11,7 @@ SECONDS_PER_HOUR = 3600 SECONDS_PER_DAY = 86400 + # ## Data format conversion functions ### @@ -36,7 +37,7 @@ def timedelta_to_str(value): hours = total_seconds / SECONDS_PER_HOUR # minutes - Total seconds subtract the used hours minutes = total_seconds / SECONDS_PER_MIN - \ - total_seconds / SECONDS_PER_HOUR * 60 + total_seconds / SECONDS_PER_HOUR * 60 seconds = total_seconds % SECONDS_PER_MIN return '%02i:%02i:%02i' % (hours, minutes, seconds) @@ -170,7 +171,7 @@ def _serialize_names(row, values_fields_mapping): return new_serialized_data -class QuerySetBasedXMLRPCSerializer(Serializer): +class QuerySetBasedRPCSerializer(Serializer): """XMLRPC serializer specific for TestPlan To configure the serialization, developer can specify following class @@ -386,7 +387,7 @@ def serialize_queryset(self): return serialize_result -class TestPlanXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): +class TestPlanRPCSerializer(QuerySetBasedRPCSerializer): """XMLRPC serializer specific for TestPlan""" values_fields_mapping = { @@ -416,7 +417,7 @@ class TestPlanXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): m2m_fields = ('case', 'tag') -class TestExecutionXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): +class TestExecutionRPCSerializer(QuerySetBasedRPCSerializer): """XMLRPC serializer specific for TestExecution""" values_fields_mapping = { @@ -440,7 +441,7 @@ class TestExecutionXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): } -class TestRunXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): +class TestRunRPCSerializer(QuerySetBasedRPCSerializer): """Serializer for TestRun""" values_fields_mapping = { @@ -463,7 +464,7 @@ class TestRunXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): } -class TestCaseXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): +class TestCaseRPCSerializer(QuerySetBasedRPCSerializer): """Serializer for TestCase""" values_fields_mapping = { @@ -493,7 +494,7 @@ class TestCaseXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): } -class ProductXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): +class ProductRPCSerializer(QuerySetBasedRPCSerializer): """Serializer for Product""" values_fields_mapping = { @@ -505,7 +506,7 @@ class ProductXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): } -class BuildXMLRPCSerializer(QuerySetBasedXMLRPCSerializer): +class BuildRPCSerializer(QuerySetBasedRPCSerializer): """Serializer for Build""" values_fields_mapping = { diff --git a/tcms/rpc/tests/test_category.py b/tcms/rpc/tests/test_category.py index cae1835d72..4cf9dffd32 100644 --- a/tcms/rpc/tests/test_category.py +++ b/tcms/rpc/tests/test_category.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # pylint: disable=attribute-defined-outside-init, invalid-name, objects-update-used -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests.factories import CategoryFactory, ProductFactory -class TestCategory(XmlrpcAPIBaseTest): +class TestCategory(RpcAPIBaseTest): def _fixture_setup(self): super(TestCategory, self)._fixture_setup() diff --git a/tcms/rpc/tests/test_component.py b/tcms/rpc/tests/test_component.py index f9e8d9a463..a53b98e93c 100644 --- a/tcms/rpc/tests/test_component.py +++ b/tcms/rpc/tests/test_component.py @@ -4,11 +4,11 @@ from xmlrpc.client import Fault as XmlRPCFault from xmlrpc.client import ProtocolError -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests.factories import ComponentFactory, ProductFactory -class TestFilterComponents(XmlrpcAPIBaseTest): +class TestFilterComponents(RpcAPIBaseTest): def _fixture_setup(self): super(TestFilterComponents, self)._fixture_setup() @@ -31,7 +31,7 @@ def test_filter_non_existing(self): self.assertEqual(0, len(found)) -class TestCreateComponent(XmlrpcAPIBaseTest): +class TestCreateComponent(RpcAPIBaseTest): def _fixture_setup(self): super(TestCreateComponent, self)._fixture_setup() @@ -57,7 +57,7 @@ def test_add_component_with_no_perms(self): self.rpc_client.exec.Component.create(self.product.pk, "MyComponent") -class TestUpdateComponent(XmlrpcAPIBaseTest): +class TestUpdateComponent(RpcAPIBaseTest): # pylint: disable=objects-update-used def _fixture_setup(self): super(TestUpdateComponent, self)._fixture_setup() diff --git a/tcms/rpc/tests/test_plantype.py b/tcms/rpc/tests/test_plantype.py index 4adca2f511..1725e1f593 100644 --- a/tcms/rpc/tests/test_plantype.py +++ b/tcms/rpc/tests/test_plantype.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # pylint: disable=attribute-defined-outside-init -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests.factories import PlanTypeFactory -class PlanTypeMethods(XmlrpcAPIBaseTest): +class PlanTypeMethods(RpcAPIBaseTest): def _fixture_setup(self): super(PlanTypeMethods, self)._fixture_setup() diff --git a/tcms/rpc/tests/test_product.py b/tcms/rpc/tests/test_product.py index d6139794f5..7ac10a73ce 100644 --- a/tcms/rpc/tests/test_product.py +++ b/tcms/rpc/tests/test_product.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # pylint: disable=attribute-defined-outside-init -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests.factories import ProductFactory -class TestFilter(XmlrpcAPIBaseTest): +class TestFilter(RpcAPIBaseTest): def _fixture_setup(self): super(TestFilter, self)._fixture_setup() diff --git a/tcms/rpc/tests/test_serializer.py b/tcms/rpc/tests/test_serializer.py index a1a5eb54bb..45cf02716c 100644 --- a/tcms/rpc/tests/test_serializer.py +++ b/tcms/rpc/tests/test_serializer.py @@ -8,7 +8,7 @@ from django.utils import timezone from tcms.management.models import Product -from tcms.rpc.serializer import (QuerySetBasedXMLRPCSerializer, Serializer, +from tcms.rpc.serializer import (QuerySetBasedRPCSerializer, Serializer, _get_related_object_pks, datetime_to_str, do_nothing, to_str) from tcms.testcases.models import TestCase @@ -58,7 +58,7 @@ def test_datetime_to_str(self): self.assertEqual(expected_value, value) -class MockTestPlanSerializer(QuerySetBasedXMLRPCSerializer): +class MockTestPlanSerializer(QuerySetBasedRPCSerializer): values_fields_mapping = { 'create_date': ('create_date', datetime_to_str), 'extra_link': ('extra_link', do_nothing), @@ -79,7 +79,7 @@ class MockTestPlanSerializer(QuerySetBasedXMLRPCSerializer): m2m_fields = ('case',) -class MockTestCaseSerializer(QuerySetBasedXMLRPCSerializer): +class MockTestCaseSerializer(QuerySetBasedRPCSerializer): primary_key = 'case_id' values_fields_mapping = { @@ -95,7 +95,7 @@ class MockTestCaseSerializer(QuerySetBasedXMLRPCSerializer): class TestQuerySetBasedSerializer(test.TestCase): - """Test QuerySetBasedXMLRPCSerializer""" + """Test QuerySetBasedRPCSerializer""" @classmethod def setUpTestData(cls): @@ -143,7 +143,7 @@ def setUpTestData(cls): product_keys.append(product.pk) cls.products = Product.objects.filter(pk__in=product_keys) - cls.product_serializer = QuerySetBasedXMLRPCSerializer(Product, cls.products) + cls.product_serializer = QuerySetBasedRPCSerializer(Product, cls.products) def test_get_values_fields_mapping(self): mapping = self.product_serializer._get_values_fields_mapping() diff --git a/tcms/rpc/tests/test_tag.py b/tcms/rpc/tests/test_tag.py index 9876d1640c..032e8bdb1a 100644 --- a/tcms/rpc/tests/test_tag.py +++ b/tcms/rpc/tests/test_tag.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # pylint: disable=attribute-defined-outside-init -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests.factories import TagFactory -class Tag(XmlrpcAPIBaseTest): +class Tag(RpcAPIBaseTest): def _fixture_setup(self): super(Tag, self)._fixture_setup() diff --git a/tcms/rpc/tests/test_testbuild.py b/tcms/rpc/tests/test_testbuild.py index bf3cc5bb5e..8fc8f90cb1 100644 --- a/tcms/rpc/tests/test_testbuild.py +++ b/tcms/rpc/tests/test_testbuild.py @@ -4,11 +4,11 @@ from xmlrpc.client import Fault as XmlRPCFault from xmlrpc.client import ProtocolError -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests.factories import BuildFactory, ProductFactory -class BuildCreate(XmlrpcAPIBaseTest): +class BuildCreate(RpcAPIBaseTest): def _fixture_setup(self): super(BuildCreate, self)._fixture_setup() @@ -80,7 +80,7 @@ def test_build_create(self): self.assertEqual(b['is_active'], False) -class BuildUpdate(XmlrpcAPIBaseTest): +class BuildUpdate(RpcAPIBaseTest): def _fixture_setup(self): super(BuildUpdate, self)._fixture_setup() @@ -124,7 +124,7 @@ def test_build_update(self): self.assertEqual(b['name'], 'Update') -class BuildFilter(XmlrpcAPIBaseTest): +class BuildFilter(RpcAPIBaseTest): def _fixture_setup(self): super(BuildFilter, self)._fixture_setup() diff --git a/tcms/rpc/tests/test_testcase.py b/tcms/rpc/tests/test_testcase.py index f2f69b99df..04e6a8603d 100644 --- a/tcms/rpc/tests/test_testcase.py +++ b/tcms/rpc/tests/test_testcase.py @@ -6,8 +6,8 @@ from django.contrib.auth.models import Permission from tcms_api import xmlrpc -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest from tcms.management.models import Priority +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.testcases.models import Category, TestCase, TestCaseStatus from tcms.tests import remove_perm_from_user from tcms.tests.factories import (CategoryFactory, ComponentFactory, @@ -15,7 +15,7 @@ TestPlanFactory, UserFactory, VersionFactory) -class TestNotificationRemoveCC(XmlrpcAPIBaseTest): +class TestNotificationRemoveCC(RpcAPIBaseTest): """ Tests the XML-RPC testcase.notication_remove_cc method """ def _fixture_setup(self): @@ -39,7 +39,7 @@ def test_remove_existing_cc(self): self.assertEqual([], self.testcase.emailing.get_cc_list()) -class TestFilterCases(XmlrpcAPIBaseTest): +class TestFilterCases(RpcAPIBaseTest): def _fixture_setup(self): super(TestFilterCases, self)._fixture_setup() @@ -69,7 +69,7 @@ def test_filter_by_product_id(self): self.assertEqual(len(cases), self.cases_count) -class TestUpdate(XmlrpcAPIBaseTest): +class TestUpdate(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -114,7 +114,7 @@ def test_update_author_issue_630(self): self.assertEqual(self.new_author.pk, updated['author_id']) -class TestCreate(XmlrpcAPIBaseTest): +class TestCreate(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -165,7 +165,7 @@ def test_fails_when_mandatory_fields_not_specified(self): ) -class TestAddTag(XmlrpcAPIBaseTest): +class TestAddTag(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -200,7 +200,7 @@ def test_add_tag_without_permissions(self): self.assertFalse(tag_exists) -class TestRemoveTag(XmlrpcAPIBaseTest): +class TestRemoveTag(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -239,7 +239,7 @@ def test_remove_tag_without_permissions(self): self.assertFalse(tag_exists) -class TestAddComponent(XmlrpcAPIBaseTest): +class TestAddComponent(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() diff --git a/tcms/rpc/tests/test_testexecution.py b/tcms/rpc/tests/test_testexecution.py index 210865f632..a3139c4af9 100644 --- a/tcms/rpc/tests/test_testexecution.py +++ b/tcms/rpc/tests/test_testexecution.py @@ -9,7 +9,7 @@ from tcms.core.contrib.linkreference.models import LinkReference from tcms.core.helpers.comments import get_comments -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.testruns.models import TestExecutionStatus from tcms.tests.factories import (BuildFactory, ProductFactory, TestCaseFactory, TestExecutionFactory, @@ -18,7 +18,7 @@ @override_settings(LANGUAGE_CODE='en') -class TestExecutionCreate(XmlrpcAPIBaseTest): # pylint: disable=too-many-instance-attributes +class TestExecutionCreate(RpcAPIBaseTest): # pylint: disable=too-many-instance-attributes """Test TestExecution.create""" def _fixture_setup(self): @@ -127,7 +127,7 @@ def test_create_with_no_perm(self): self.rpc_client.exec.TestExecution.create(values) -class TestExecutionAddComment(XmlrpcAPIBaseTest): +class TestExecutionAddComment(RpcAPIBaseTest): """Test TestExecution.add_comment""" def _fixture_setup(self): @@ -147,7 +147,7 @@ def test_add_comment_with_pk_as_int(self): @override_settings(LANGUAGE_CODE='en') -class TestExecutionAddLink(XmlrpcAPIBaseTest): +class TestExecutionAddLink(RpcAPIBaseTest): """Test TestExecution.add_link""" def _fixture_setup(self): @@ -172,7 +172,7 @@ def test_attach_log(self): self.assertEqual(result['url'], url) -class TestExecutionRemoveLink(XmlrpcAPIBaseTest): +class TestExecutionRemoveLink(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -210,7 +210,7 @@ def test_detach_log(self): self.assertEqual([], list(self.case_run.links())) -class TestExecutionFilter(XmlrpcAPIBaseTest): +class TestExecutionFilter(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -237,7 +237,7 @@ def test_filter_by_id(self): self.assertEqual(tcr['status_id'], self.status_idle.pk) -class TestExecutionGetLinks(XmlrpcAPIBaseTest): +class TestExecutionGetLinks(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -270,7 +270,7 @@ def test_get_links(self): @override_settings(LANGUAGE_CODE='en') -class TestExecutionUpdate(XmlrpcAPIBaseTest): +class TestExecutionUpdate(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() diff --git a/tcms/rpc/tests/test_testplan.py b/tcms/rpc/tests/test_testplan.py index 5679559fa1..a821979ef0 100644 --- a/tcms/rpc/tests/test_testplan.py +++ b/tcms/rpc/tests/test_testplan.py @@ -5,7 +5,7 @@ from django.contrib.auth.models import Permission from tcms_api import xmlrpc -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.testcases.models import TestCasePlan from tcms.testplans.models import TestPlan from tcms.tests import remove_perm_from_user @@ -14,7 +14,7 @@ UserFactory, VersionFactory) -class TestFilter(XmlrpcAPIBaseTest): +class TestFilter(RpcAPIBaseTest): def _fixture_setup(self): super(TestFilter, self)._fixture_setup() @@ -45,7 +45,7 @@ def test_filter_out_all_plans(self): self.assertEqual(plans_total, len(self.rpc_client.exec.TestPlan.filter({}))) -class TestAddTag(XmlrpcAPIBaseTest): +class TestAddTag(RpcAPIBaseTest): def _fixture_setup(self): super(TestAddTag, self)._fixture_setup() @@ -84,7 +84,7 @@ def test_add_tag_without_permissions(self): self.assertFalse(tag_exists) -class TestRemoveTag(XmlrpcAPIBaseTest): +class TestRemoveTag(RpcAPIBaseTest): def _fixture_setup(self): super(TestRemoveTag, self)._fixture_setup() @@ -129,7 +129,7 @@ def test_remove_tag_without_permissions(self): self.assertFalse(tag_exists) -class TestUpdate(XmlrpcAPIBaseTest): # pylint: disable=too-many-instance-attributes +class TestUpdate(RpcAPIBaseTest): # pylint: disable=too-many-instance-attributes """ Tests the XMLRPM testplan.update method """ def _fixture_setup(self): @@ -156,7 +156,7 @@ def test_update_text(self): self.assertEqual('This has been updated', self.plan_1.text) -class TestRemoveCase(XmlrpcAPIBaseTest): +class TestRemoveCase(RpcAPIBaseTest): """ Test the XML-RPC method TestPlan.remove_case() """ def _fixture_setup(self): @@ -182,7 +182,7 @@ def test_remove_case_with_two_plans(self): self.assertEqual(1, self.testcase_2.plan.count()) # pylint: disable=no-member -class TestAddCase(XmlrpcAPIBaseTest): +class TestAddCase(RpcAPIBaseTest): """ Test the XML-RPC method TestPlan.add_case() """ def _fixture_setup(self): diff --git a/tcms/rpc/tests/test_testrun.py b/tcms/rpc/tests/test_testrun.py index 61f56c73e4..38bced8dd2 100644 --- a/tcms/rpc/tests/test_testrun.py +++ b/tcms/rpc/tests/test_testrun.py @@ -6,7 +6,7 @@ from django.contrib.auth.models import Permission from tcms_api import xmlrpc -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.testruns.models import TestExecution, TestRun from tcms.tests import remove_perm_from_user from tcms.tests.factories import (BuildFactory, ProductFactory, TagFactory, @@ -15,7 +15,7 @@ VersionFactory) -class TestAddCase(XmlrpcAPIBaseTest): +class TestAddCase(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -55,7 +55,7 @@ def test_add_case_without_permissions(self): self.assertFalse(exists) -class TestRemovesCase(XmlrpcAPIBaseTest): +class TestRemovesCase(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -104,7 +104,7 @@ def test_should_remove_a_case_run(self): self.assertFalse(TestExecution.objects.filter(pk=self.test_execution.pk).exists()) -class TestAddTag(XmlrpcAPIBaseTest): +class TestAddTag(RpcAPIBaseTest): def _fixture_setup(self): super(TestAddTag, self)._fixture_setup() @@ -152,7 +152,7 @@ def test_add_tag_without_permissions(self): self.assertFalse(tag_exists) -class TestRemoveTag(XmlrpcAPIBaseTest): +class TestRemoveTag(RpcAPIBaseTest): def _fixture_setup(self): super(TestRemoveTag, self)._fixture_setup() @@ -210,7 +210,7 @@ def test_remove_tag_without_permissions(self): self.assertTrue(tag_exists) -class TestProductVersionWhenCreating(XmlrpcAPIBaseTest): +class TestProductVersionWhenCreating(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() @@ -249,7 +249,7 @@ def test_create_with_product_version(self): self.assertEqual(result['product_version'], self.plan.product_version.value) -class TestUpdateTestRun(XmlrpcAPIBaseTest): +class TestUpdateTestRun(RpcAPIBaseTest): def _fixture_setup(self): super()._fixture_setup() diff --git a/tcms/rpc/tests/test_user.py b/tcms/rpc/tests/test_user.py index 42868ddfc2..a98e922e89 100644 --- a/tcms/rpc/tests/test_user.py +++ b/tcms/rpc/tests/test_user.py @@ -6,7 +6,7 @@ from django.test import TestCase from tcms.rpc.api.user import _get_user_dict -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests import user_should_have_perm from tcms.tests.factories import GroupFactory, UserFactory @@ -25,7 +25,7 @@ def test_ensure_password_not_returned(self): self.assertNotIn('password', data) -class TestUserFilter(XmlrpcAPIBaseTest): +class TestUserFilter(RpcAPIBaseTest): """Test User.filter""" def _fixture_setup(self): @@ -69,7 +69,7 @@ def test_get_me(self): self.assertEqual(data['email'], self.api_user.email) -class TestUserJoin(XmlrpcAPIBaseTest): +class TestUserJoin(RpcAPIBaseTest): """Test User.join_group""" def _fixture_setup(self): @@ -97,7 +97,7 @@ def test_join_nonexistent_group(self): self.rpc_client.exec.User.join_group(self.user.username, 'nonexistent group name') -class TestUserUpdate(XmlrpcAPIBaseTest): +class TestUserUpdate(RpcAPIBaseTest): """Test User.update""" def _fixture_setup(self): diff --git a/tcms/rpc/tests/test_version.py b/tcms/rpc/tests/test_version.py index 946b33fcde..ad41dc224b 100644 --- a/tcms/rpc/tests/test_version.py +++ b/tcms/rpc/tests/test_version.py @@ -6,11 +6,11 @@ from django.test import override_settings -from tcms.rpc.tests.utils import XmlrpcAPIBaseTest +from tcms.rpc.tests.utils import RpcAPIBaseTest from tcms.tests.factories import ProductFactory, VersionFactory -class TestFilterVersions(XmlrpcAPIBaseTest): +class TestFilterVersions(RpcAPIBaseTest): def _fixture_setup(self): super(TestFilterVersions, self)._fixture_setup() @@ -38,7 +38,7 @@ def test_filter_by_name(self): @override_settings(LANGUAGE_CODE='en') -class TestAddVersion(XmlrpcAPIBaseTest): +class TestAddVersion(RpcAPIBaseTest): def _fixture_setup(self): super(TestAddVersion, self)._fixture_setup() diff --git a/tcms/rpc/tests/utils.py b/tcms/rpc/tests/utils.py index b97dc1523d..e19dc2c32d 100644 --- a/tcms/rpc/tests/utils.py +++ b/tcms/rpc/tests/utils.py @@ -10,7 +10,7 @@ from tcms.utils.permissions import initiate_user_with_default_setups -class XmlrpcAPIBaseTest(test.LiveServerTestCase): +class RpcAPIBaseTest(test.LiveServerTestCase): serialized_rollback = True # NOTE: we setup the required DB data and API objects here @@ -20,7 +20,7 @@ class XmlrpcAPIBaseTest(test.LiveServerTestCase): def _fixture_setup(self): # restore the serialized data from initial migrations # this includes default groups and permissions - super(XmlrpcAPIBaseTest, self)._fixture_setup() + super(RpcAPIBaseTest, self)._fixture_setup() self.api_user = UserFactory() self.api_user.set_password('api-testing') initiate_user_with_default_setups(self.api_user) diff --git a/tcms/testcases/models.py b/tcms/testcases/models.py index 8b61b47de7..d2c42e4a01 100644 --- a/tcms/testcases/models.py +++ b/tcms/testcases/models.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- +import vinaigrette from django.conf import settings from django.db import models from django.db.models import ObjectDoesNotExist +from django.db.models import Q from django.urls import reverse from django.utils.translation import override -from django.db.models import Q -import vinaigrette from tcms.core.history import KiwiHistoricalRecords from tcms.core.models import TCMSActionModel -from tcms.testcases.fields import MultipleEmailField -from tcms.rpc.serializer import TestCaseXMLRPCSerializer +from tcms.rpc.serializer import TestCaseRPCSerializer from tcms.rpc.utils import distinct_filter +from tcms.testcases.fields import MultipleEmailField class TestCaseStatus(TCMSActionModel): @@ -117,7 +117,7 @@ def to_xmlrpc(cls, query=None): _query = query or {} qs = distinct_filter(TestCase, _query).order_by('pk') - serializer = TestCaseXMLRPCSerializer(model_class=cls, queryset=qs) + serializer = TestCaseRPCSerializer(model_class=cls, queryset=qs) return serializer.serialize_queryset() # todo: does this check permissions ??? diff --git a/tcms/testplans/models.py b/tcms/testplans/models.py index 32f455a878..590a7d62bf 100644 --- a/tcms/testplans/models.py +++ b/tcms/testplans/models.py @@ -15,7 +15,7 @@ from tcms.testcases.models import (Category, TestCase, TestCasePlan, TestCaseStatus) -from tcms.rpc.serializer import TestPlanXMLRPCSerializer +from tcms.rpc.serializer import TestPlanRPCSerializer from tcms.rpc.utils import distinct_filter @@ -65,7 +65,7 @@ def to_xmlrpc(cls, query=None): _query = query or {} qs = distinct_filter(TestPlan, _query).order_by('pk') - serializer = TestPlanXMLRPCSerializer(model_class=cls, queryset=qs) + serializer = TestPlanRPCSerializer(model_class=cls, queryset=qs) return serializer.serialize_queryset() @classmethod diff --git a/tcms/testruns/models.py b/tcms/testruns/models.py index a8f0052518..62f8844d75 100755 --- a/tcms/testruns/models.py +++ b/tcms/testruns/models.py @@ -12,8 +12,8 @@ from tcms.core.contrib.linkreference.models import LinkReference from tcms.core.history import KiwiHistoricalRecords from tcms.core.models import TCMSActionModel -from tcms.rpc.serializer import (TestExecutionXMLRPCSerializer, - TestRunXMLRPCSerializer) +from tcms.rpc.serializer import (TestExecutionRPCSerializer, + TestRunRPCSerializer) from tcms.rpc.utils import distinct_filter TestExecutionStatusSubtotal = namedtuple('TestExecutionStatusSubtotal', [ @@ -66,7 +66,7 @@ def __str__(self): def to_xmlrpc(cls, query=None): _query = query or {} qs = distinct_filter(TestRun, _query).order_by('pk') - serializer = TestRunXMLRPCSerializer(model_class=cls, queryset=qs) + serializer = TestRunRPCSerializer(model_class=cls, queryset=qs) return serializer.serialize_queryset() def _get_absolute_url(self): @@ -103,8 +103,8 @@ def add_case_run(self, case, status=1, assignee=None, _case_text_version = case.history.latest().history_id _assignee = assignee \ - or (case.default_tester_id and case.default_tester) \ - or (self.default_tester_id and self.default_tester) + or (case.default_tester_id and case.default_tester) \ + or (self.default_tester_id and self.default_tester) _status = TestExecutionStatus.objects.get(id=status) \ if isinstance(status, int) else status @@ -234,7 +234,6 @@ def stats_executions_status(self, statuses=None): class TestExecutionStatus(TCMSActionModel): - id = models.AutoField(db_column='case_run_status_id', primary_key=True) name = models.CharField(max_length=60, blank=True, unique=True) weight = models.IntegerField(default=0) @@ -296,7 +295,7 @@ def to_xmlrpc(cls, query: dict = None): if query is None: query = {} query_set = distinct_filter(TestExecution, query).order_by('pk') - serializer = TestExecutionXMLRPCSerializer(model_class=cls, queryset=query_set) + serializer = TestExecutionRPCSerializer(model_class=cls, queryset=query_set) return serializer.serialize_queryset() def get_bugs(self):