From 8fcd1cbe0346d9f28e5afe79373e16551838b926 Mon Sep 17 00:00:00 2001 From: SidneyAn Date: Wed, 15 Jan 2020 09:45:53 +0800 Subject: [PATCH] add test case for migration sync and version add test class DbSyncTestCase add test case for migration database sync Story: 2007082 Task: 38152 Depends-on: https://review.opendev.org/#/c/702823/ Signed-off-by: SidneyAn Signed-off-by: chenyan Change-Id: I8121dedae7e4319a454dc128a591f74ef066c149 --- fm-rest-api/fm/fm/tests/base.py | 25 ++++++++++++++++++++- fm-rest-api/fm/fm/tests/conf_fixture.py | 2 ++ fm-rest-api/fm/fm/tests/db/base.py | 2 ++ fm-rest-api/fm/fm/tests/db/utils.py | 3 +-- fm-rest-api/fm/fm/tests/test_dbsync.py | 29 +++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 fm-rest-api/fm/fm/tests/test_dbsync.py diff --git a/fm-rest-api/fm/fm/tests/base.py b/fm-rest-api/fm/fm/tests/base.py index e6abb5d2..7c7cf4fa 100644 --- a/fm-rest-api/fm/fm/tests/base.py +++ b/fm-rest-api/fm/fm/tests/base.py @@ -20,6 +20,7 @@ inline callbacks. """ import sys +import os import fixtures import mock @@ -34,7 +35,6 @@ from fm.tests import conf_fixture CONF = cfg.CONF _DB_CACHE = None -INIT_VERSION = 0 sys.modules['fm_core'] = mock.Mock() @@ -46,11 +46,34 @@ class TestCase(testtools.TestCase): """Run before each test method to initialize test environment.""" super(TestCase, self).setUp() + test_timeout = os.environ.get('OS_TEST_TIMEOUT', 0) + try: + test_timeout = int(test_timeout) + except ValueError: + # If timeout value is invalid do not set a timeout. + test_timeout = 0 + if test_timeout > 0: + self.useFixture(fixtures.Timeout(test_timeout, gentle=True)) + self.useFixture(fixtures.NestedTempfile()) + self.useFixture(fixtures.TempHomeDir()) + + if (os.environ.get('OS_STDOUT_CAPTURE') == 'True' or + os.environ.get('OS_STDOUT_CAPTURE') == '1'): + stdout = self.useFixture(fixtures.StringStream('stdout')).stream + self.useFixture(fixtures.MonkeyPatch('sys.stdout', stdout)) + if (os.environ.get('OS_STDERR_CAPTURE') == 'True' or + os.environ.get('OS_STDERR_CAPTURE') == '1'): + stderr = self.useFixture(fixtures.StringStream('stderr')).stream + self.useFixture(fixtures.MonkeyPatch('sys.stderr', stderr)) + + self.log_fixture = self.useFixture(fixtures.FakeLogger()) + def fake_logging_setup(*args): pass self.useFixture( fixtures.MonkeyPatch('oslo_log.log.setup', fake_logging_setup)) + logging.register_options(CONF) self.useFixture(conf_fixture.ConfFixture(CONF)) diff --git a/fm-rest-api/fm/fm/tests/conf_fixture.py b/fm-rest-api/fm/fm/tests/conf_fixture.py index 5440ee87..83f2e809 100644 --- a/fm-rest-api/fm/fm/tests/conf_fixture.py +++ b/fm-rest-api/fm/fm/tests/conf_fixture.py @@ -13,6 +13,8 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. +# +# Copyright 2020 Intel Corporation. from oslo_config import cfg from oslo_config import fixture as config_fixture diff --git a/fm-rest-api/fm/fm/tests/db/base.py b/fm-rest-api/fm/fm/tests/db/base.py index 43131988..2315eff6 100644 --- a/fm-rest-api/fm/fm/tests/db/base.py +++ b/fm-rest-api/fm/fm/tests/db/base.py @@ -21,6 +21,8 @@ import six from fm.common import context from fm.tests import base +INIT_VERSION = 0 + @six.add_metaclass(abc.ABCMeta) class DbTestCase(base.TestCase): diff --git a/fm-rest-api/fm/fm/tests/db/utils.py b/fm-rest-api/fm/fm/tests/db/utils.py index 94153b59..4df03dc2 100644 --- a/fm-rest-api/fm/fm/tests/db/utils.py +++ b/fm-rest-api/fm/fm/tests/db/utils.py @@ -12,8 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. # -# Copyright 2020 Intel Corporation. -# +# Copyright 2020 Intel Corporation """Fault test utilities.""" diff --git a/fm-rest-api/fm/fm/tests/test_dbsync.py b/fm-rest-api/fm/fm/tests/test_dbsync.py new file mode 100644 index 00000000..95f63d49 --- /dev/null +++ b/fm-rest-api/fm/fm/tests/test_dbsync.py @@ -0,0 +1,29 @@ +# Copyright 2020 Intel Corporation. +# All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +from fm.db import migration +from fm.db.sqlalchemy import api as db_api +from fm.tests.db import base + + +class DbSyncTestCase(base.DbTestCase): + def setUp(self): + super(DbSyncTestCase, self).setUp() + + def test_sync_and_version(self): + migration.db_sync() + engine = db_api.get_engine() + v = migration.get_backend().db_version(engine, migration.MIGRATE_REPO_PATH, None) + self.assertTrue(v > base.INIT_VERSION)