diff --git a/monasca_log_api/tests/base.py b/monasca_log_api/tests/base.py index 642b8a37..9c985120 100644 --- a/monasca_log_api/tests/base.py +++ b/monasca_log_api/tests/base.py @@ -13,8 +13,11 @@ # License for the specific language governing permissions and limitations # under the License. import falcon +from falcon import testing +import mock from oslo_config import fixture as oo_cfg from oslo_context import fixture as oo_ctx +from oslotest import base as os_test from monasca_log_api.api.core import request @@ -27,6 +30,21 @@ def mock_context(test): return test.useFixture(oo_ctx.ClearRequestContext()) +class DisableStatsdMixin(object): + def setUp(self): + super(DisableStatsdMixin, self).setUp() + self.statsd_patch = mock.patch('monascastatsd.Connection') + self.statsd_check = self.statsd_patch.start() + + +class BaseTestCase(DisableStatsdMixin, os_test.BaseTestCase): + pass + + +class TestBase(DisableStatsdMixin, testing.TestBase): + pass + + class MockedAPI(falcon.API): """MockedAPI diff --git a/monasca_log_api/tests/test_healthchecks.py b/monasca_log_api/tests/test_healthchecks.py index 7d7d79f0..f1663769 100644 --- a/monasca_log_api/tests/test_healthchecks.py +++ b/monasca_log_api/tests/test_healthchecks.py @@ -13,7 +13,6 @@ # under the License. import falcon -from falcon import testing import mock import simplejson as json @@ -24,7 +23,7 @@ from monasca_log_api.tests import base ENDPOINT = '/healthcheck' -class TestHealthChecks(testing.TestBase): +class TestHealthChecks(base.TestBase): def before(self): self.conf = base.mock_config(self) self.resource = healthchecks.HealthChecks() diff --git a/monasca_log_api/tests/test_kafka_check.py b/monasca_log_api/tests/test_kafka_check.py index 83db847b..2067774d 100644 --- a/monasca_log_api/tests/test_kafka_check.py +++ b/monasca_log_api/tests/test_kafka_check.py @@ -13,7 +13,6 @@ # under the License. import mock -from oslotest import base as os_test from monasca_common.kafka_lib import client @@ -21,7 +20,7 @@ from monasca_log_api.healthcheck import kafka_check as kc from monasca_log_api.tests import base -class KafkaCheckLogicTest(os_test.BaseTestCase): +class KafkaCheckLogicTest(base.BaseTestCase): mock_kafka_url = 'localhost:1234' mocked_topics = ['test_1', 'test_2'] diff --git a/monasca_log_api/tests/test_log_publisher.py b/monasca_log_api/tests/test_log_publisher.py index 522267ef..6c2f1597 100644 --- a/monasca_log_api/tests/test_log_publisher.py +++ b/monasca_log_api/tests/test_log_publisher.py @@ -21,7 +21,6 @@ import ujson import unittest import mock -from oslotest import base as os_test from monasca_log_api.reference.common import log_publisher from monasca_log_api.reference.common import model @@ -40,7 +39,7 @@ def _generate_unique_message(size): return rand(size) -class TestSendMessage(os_test.BaseTestCase): +class TestSendMessage(base.BaseTestCase): def setUp(self): self.conf = base.mock_config(self) @@ -193,7 +192,7 @@ class TestSendMessage(os_test.BaseTestCase): @mock.patch( 'monasca_log_api.reference.common.log_publisher.producer' '.KafkaProducer') -class TestTruncation(os_test.BaseTestCase): +class TestTruncation(base.BaseTestCase): EXTRA_CHARS_SIZE = len(bytearray(ujson.dumps({ 'log': { 'message': None diff --git a/monasca_log_api/tests/test_logs.py b/monasca_log_api/tests/test_logs.py index 5aac6161..f7a4eaee 100644 --- a/monasca_log_api/tests/test_logs.py +++ b/monasca_log_api/tests/test_logs.py @@ -14,9 +14,7 @@ # under the License. import falcon -from falcon import testing import mock -import unittest from monasca_log_api.api import exceptions as log_api_exceptions from monasca_log_api.api import headers @@ -32,7 +30,7 @@ def _init_resource(test): return resource -class TestLogsVersion(unittest.TestCase): +class TestLogsVersion(base.TestBase): @mock.patch('monasca_log_api.reference.common.log_publisher.LogPublisher') @mock.patch('monasca_log_api.reference.v2.common.service.LogCreator') def test_should_return_v2_as_version(self, _, __): @@ -40,7 +38,7 @@ class TestLogsVersion(unittest.TestCase): self.assertEqual('v2.0', logs_resource.version) -class TestLogs(testing.TestBase): +class TestLogs(base.TestBase): api_class = base.MockedAPI diff --git a/monasca_log_api/tests/test_logs_v3.py b/monasca_log_api/tests/test_logs_v3.py index 37f2569d..218371ce 100644 --- a/monasca_log_api/tests/test_logs_v3.py +++ b/monasca_log_api/tests/test_logs_v3.py @@ -14,10 +14,9 @@ import random import string -import unittest + import falcon -from falcon import testing import mock import ujson as json @@ -66,7 +65,7 @@ def _generate_v3_payload(log_count): return v3_body, v3_logs -class TestLogsVersion(unittest.TestCase): +class TestLogsVersion(base.TestBase): @mock.patch('monasca_log_api.reference.v3.common.' 'bulk_processor.BulkProcessor') @@ -78,7 +77,7 @@ class TestLogsVersion(unittest.TestCase): @mock.patch('monasca_log_api.reference.common.log_publisher.producer.' 'KafkaProducer') @mock.patch('monasca_log_api.monitoring.client.monascastatsd.Connection') -class TestLogsMonitoring(testing.TestBase): +class TestLogsMonitoring(base.TestBase): api_class = base.MockedAPI @@ -207,7 +206,7 @@ class TestLogsMonitoring(testing.TestBase): size_gauge.mock_calls[0][2]['value']) -class TestLogs(testing.TestBase): +class TestLogs(base.TestBase): api_class = base.MockedAPI diff --git a/monasca_log_api/tests/test_monitoring.py b/monasca_log_api/tests/test_monitoring.py index 72c4b0e4..101ad373 100644 --- a/monasca_log_api/tests/test_monitoring.py +++ b/monasca_log_api/tests/test_monitoring.py @@ -14,9 +14,8 @@ import mock -from oslotest import base - from monasca_log_api.monitoring import client +from monasca_log_api.tests import base class TestMonitoring(base.BaseTestCase): diff --git a/monasca_log_api/tests/test_request.py b/monasca_log_api/tests/test_request.py index 8acb94ed..d969da25 100644 --- a/monasca_log_api/tests/test_request.py +++ b/monasca_log_api/tests/test_request.py @@ -14,14 +14,13 @@ from falcon import testing from mock import mock -from oslotest import base as os_test from monasca_log_api.api.core import request from monasca_log_api.reference.common import validation from monasca_log_api.tests import base -class TestRequest(os_test.BaseTestCase): +class TestRequest(base.BaseTestCase): def setUp(self): super(TestRequest, self).setUp() diff --git a/monasca_log_api/tests/test_role_middleware.py b/monasca_log_api/tests/test_role_middleware.py index 8f89e539..243cc78f 100644 --- a/monasca_log_api/tests/test_role_middleware.py +++ b/monasca_log_api/tests/test_role_middleware.py @@ -15,9 +15,8 @@ import mock from webob import response -from oslotest import base - from monasca_log_api.middleware import role_middleware as rm +from monasca_log_api.tests import base class SideLogicTestEnsureLowerRoles(base.BaseTestCase): diff --git a/monasca_log_api/tests/test_service.py b/monasca_log_api/tests/test_service.py index 0d3783c2..08f7b9e6 100644 --- a/monasca_log_api/tests/test_service.py +++ b/monasca_log_api/tests/test_service.py @@ -19,7 +19,6 @@ import unittest from falcon import errors from falcon import testing import mock -from oslotest import base as os_test from monasca_log_api.api import exceptions from monasca_log_api.reference.common import validation @@ -27,7 +26,7 @@ from monasca_log_api.reference.v2.common import service as common_service from monasca_log_api.tests import base -class IsDelegate(os_test.BaseTestCase): +class IsDelegate(base.BaseTestCase): def __init__(self, *args, **kwargs): super(IsDelegate, self).__init__(*args, **kwargs) @@ -50,7 +49,7 @@ class IsDelegate(os_test.BaseTestCase): self.assertFalse(validation.validate_is_delegate(roles)) -class ParseDimensions(os_test.BaseTestCase): +class ParseDimensions(base.BaseTestCase): def test_should_fail_for_empty_dimensions(self): self.assertRaises(exceptions.HTTPUnprocessableEntity, common_service.parse_dimensions, @@ -84,7 +83,7 @@ class ParseDimensions(os_test.BaseTestCase): common_service.parse_dimensions(dimensions)) -class ParseApplicationType(os_test.BaseTestCase): +class ParseApplicationType(base.BaseTestCase): def test_should_return_none_for_none(self): self.assertIsNone(common_service.parse_application_type(None)) @@ -106,7 +105,7 @@ class ParseApplicationType(os_test.BaseTestCase): common_service.parse_application_type(app_type)) -class ApplicationTypeValidations(os_test.BaseTestCase): +class ApplicationTypeValidations(base.BaseTestCase): def test_should_pass_for_empty_app_type(self): validation.validate_application_type() validation.validate_application_type('') @@ -139,7 +138,7 @@ class ApplicationTypeValidations(os_test.BaseTestCase): validation.validate_application_type(r_app_type) -class DimensionsValidations(os_test.BaseTestCase): +class DimensionsValidations(base.BaseTestCase): @unittest.expectedFailure def test_should_fail_for_none_dimensions(self): validation.validate_dimensions(None) @@ -230,7 +229,7 @@ class DimensionsValidations(os_test.BaseTestCase): validation.validate_dimensions(dimensions) -class ContentTypeValidations(os_test.BaseTestCase): +class ContentTypeValidations(base.BaseTestCase): def test_should_pass_text_plain(self): content_type = 'text/plain' allowed_types = ['text/plain'] @@ -277,7 +276,7 @@ class ContentTypeValidations(os_test.BaseTestCase): ) -class PayloadSizeValidations(os_test.BaseTestCase): +class PayloadSizeValidations(base.BaseTestCase): def setUp(self): super(PayloadSizeValidations, self).setUp() self.conf = base.mock_config(self) @@ -334,7 +333,7 @@ class PayloadSizeValidations(os_test.BaseTestCase): ) -class LogMessageValidations(os_test.BaseTestCase): +class LogMessageValidations(base.BaseTestCase): def test_should_pass_message_in_log_property(self): log_object = { 'message': 'some messages', @@ -361,7 +360,7 @@ class LogMessageValidations(os_test.BaseTestCase): validation.validate_log_message, {}) -class LogsCreatorNewLog(os_test.BaseTestCase): +class LogsCreatorNewLog(base.BaseTestCase): def setUp(self): super(LogsCreatorNewLog, self).setUp() self.instance = common_service.LogCreator() @@ -415,7 +414,7 @@ class LogsCreatorNewLog(os_test.BaseTestCase): )) -class LogCreatorNewEnvelope(os_test.BaseTestCase): +class LogCreatorNewEnvelope(base.BaseTestCase): def setUp(self): super(LogCreatorNewEnvelope, self).setUp() self.instance = common_service.LogCreator() diff --git a/monasca_log_api/tests/test_v2_v3_compare.py b/monasca_log_api/tests/test_v2_v3_compare.py index ae80fdd5..b9b9ad2a 100644 --- a/monasca_log_api/tests/test_v2_v3_compare.py +++ b/monasca_log_api/tests/test_v2_v3_compare.py @@ -12,7 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from falcon import testing import mock import ujson as json @@ -22,7 +21,7 @@ from monasca_log_api.reference.v3 import logs as v3_logs from monasca_log_api.tests import base -class SameV2V3Output(testing.TestBase): +class SameV2V3Output(base.TestBase): api_class = base.MockedAPI diff --git a/monasca_log_api/tests/test_version.py b/monasca_log_api/tests/test_version.py index 16829ec5..4d7605b4 100644 --- a/monasca_log_api/tests/test_version.py +++ b/monasca_log_api/tests/test_version.py @@ -12,8 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslotest import base - +from monasca_log_api.tests import base from monasca_log_api import version diff --git a/monasca_log_api/tests/test_versions.py b/monasca_log_api/tests/test_versions.py index 29e70344..b55f2737 100644 --- a/monasca_log_api/tests/test_versions.py +++ b/monasca_log_api/tests/test_versions.py @@ -13,17 +13,17 @@ # under the License. import falcon -from falcon import testing import ujson as json from monasca_log_api.reference import versions +from monasca_log_api.tests import base def _get_versioned_url(version_id): return '/version/%s' % version_id -class TestVersions(testing.TestBase): +class TestVersions(base.TestBase): def __init__(self, *args, **kwargs): self.versions = None super(TestVersions, self).__init__(*args, **kwargs)