From 0ba46dd5a25de727dd3fb495f6fcb731826dec23 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Mon, 10 Sep 2018 18:26:44 -0600 Subject: [PATCH] Add logging_error_fixture to functional tests The fixture will cause a formatting error when writing logs to be raised as an exception (thus failing tests). In the non-gabbi tests the fixture is started in the normal way with useFixture. In the gabbi tests the fixture setUp and cleanUp is done manually because the fixtures start and stop per yaml file, not per test. Change-Id: Ia5094c3a12bcb9d19d429fbe2164b4533ca9c715 --- placement/tests/functional/base.py | 2 ++ placement/tests/functional/fixtures/gabbits.py | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/placement/tests/functional/base.py b/placement/tests/functional/base.py index 62dfe5169..f25dd7c62 100644 --- a/placement/tests/functional/base.py +++ b/placement/tests/functional/base.py @@ -12,6 +12,7 @@ from oslo_config import cfg from oslo_config import fixture as config_fixture +from oslo_log.fixture import logging_error from oslotest import output import testtools @@ -53,6 +54,7 @@ class TestCase(testtools.TestCase): self.useFixture(output.CaptureOutput()) # Filter ignorable warnings during test runs. self.useFixture(capture.WarningsFixture()) + self.useFixture(logging_error.get_logging_handle_error_fixture()) self.placement_db = self.useFixture( fixtures.Database(database='placement')) diff --git a/placement/tests/functional/fixtures/gabbits.py b/placement/tests/functional/fixtures/gabbits.py index e37d4c02e..46cb8f9ec 100644 --- a/placement/tests/functional/fixtures/gabbits.py +++ b/placement/tests/functional/fixtures/gabbits.py @@ -16,6 +16,7 @@ import os from gabbi import fixture from oslo_config import cfg from oslo_config import fixture as config_fixture +from oslo_log.fixture import logging_error from oslo_middleware import cors from oslo_policy import opts as policy_opts from oslo_utils.fixture import uuidsentinel as uuids @@ -54,6 +55,9 @@ class APIFixture(fixture.GabbiFixture): self.standard_logging_fixture.setUp() self.output_stream_fixture = output.CaptureOutput() self.output_stream_fixture.setUp() + self.logging_error_fixture = ( + logging_error.get_logging_handle_error_fixture()) + self.logging_error_fixture.setUp() # Filter ignorable warnings during test runs. self.warnings_fixture = capture.WarningsFixture() self.warnings_fixture.setUp() @@ -117,6 +121,7 @@ class APIFixture(fixture.GabbiFixture): self.warnings_fixture.cleanUp() self.output_stream_fixture.cleanUp() self.standard_logging_fixture.cleanUp() + self.logging_error_fixture.cleanUp() self.conf_fixture.cleanUp() @staticmethod