From d23c744b315996b6e5c6f87ba745e6a43aa5aad1 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Tue, 4 Aug 2020 11:50:05 +0000 Subject: [PATCH] Edit unit test base class inheritance Editing the inheritance within our unit test base classes will simplify reusing certain methods from the classes and will indirectly fix TypeError: unbound method issue we face now in RDO where python-tempestconf is packaged. Change-Id: Iaa11400caaaef3f5185491229dac0b32f358d9af --- config_tempest/tests/base.py | 2 +- config_tempest/tests/services/test_octavia.py | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/config_tempest/tests/base.py b/config_tempest/tests/base.py index 90031686..a00d1988 100644 --- a/config_tempest/tests/base.py +++ b/config_tempest/tests/base.py @@ -103,7 +103,7 @@ class BaseConfigTempestTest(base.BaseTestCase): return ClientManager(conf, creds) -class BaseServiceTest(base.BaseTestCase): +class BaseServiceTest(BaseConfigTempestTest): """Test case base class for all api_discovery unit tests""" FAKE_TOKEN = "s6d5f45sdf4s564f4s6464sdfsd514" diff --git a/config_tempest/tests/services/test_octavia.py b/config_tempest/tests/services/test_octavia.py index 30bc0f8b..7f42c551 100644 --- a/config_tempest/tests/services/test_octavia.py +++ b/config_tempest/tests/services/test_octavia.py @@ -16,25 +16,24 @@ from unittest import mock from config_tempest.services.octavia import LoadBalancerService -from config_tempest.tests.base import BaseConfigTempestTest -from config_tempest.tests.base import BaseServiceTest as bst +from config_tempest.tests.base import BaseServiceTest -class TestOctaviaService(BaseConfigTempestTest): +class TestOctaviaService(BaseServiceTest): def setUp(self): super(TestOctaviaService, self).setUp() self.conf = self._get_conf("v2", "v3") self.clients = self._get_clients(self.conf) self.Service = LoadBalancerService("ServiceName", "ServiceType", - bst.FAKE_URL + "v2.0/", - bst.FAKE_TOKEN, + self.FAKE_URL + "v2.0/", + self.FAKE_TOKEN, disable_ssl_validation=False) - self.Service.client = bst.FakeServiceClient( + self.Service.client = self.FakeServiceClient( services={"services": [{"name": "octavia", "enabled": True}]} ) self.conf.set("identity", "region", "regionOne") - bst._fake_service_do_get_method(self, bst.FAKE_LBAAS_PROVIDERS) + self._fake_service_do_get_method(self.FAKE_LBAAS_PROVIDERS) def test_list_drivers(self): expected_resp = [