From 64c133a5b6cc85fdfe48deacf6ea95391e6ae48c Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Sun, 22 Mar 2020 20:20:36 +0200 Subject: [PATCH] Get back yamlutils and dummy scenarios rally-openstack uses these modules, so we need to move them in a backward compatible way. Change-Id: I4c4fe1d4dcf96435729ab13f545c65d72231637e --- rally/common/yamlutils.py | 24 +++++++++++++++++++ .../common/scenarios/dummy/__init__.py | 0 rally/plugins/common/scenarios/dummy/dummy.py | 24 +++++++++++++++++++ tests/ci/cover.sh | 2 +- 4 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 rally/common/yamlutils.py create mode 100644 rally/plugins/common/scenarios/dummy/__init__.py create mode 100644 rally/plugins/common/scenarios/dummy/dummy.py diff --git a/rally/common/yamlutils.py b/rally/common/yamlutils.py new file mode 100644 index 0000000000..6f2cc0f8dc --- /dev/null +++ b/rally/common/yamlutils.py @@ -0,0 +1,24 @@ +# 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 rally.cli.yamlutils import * # noqa: F401,F403 +from rally.cli import yamlutils as _new + +# import it as last item to be sure that we use the right module +from rally.common import logging + + +logging.log_deprecated_module( + target=__name__, new_module=_new.__name__, release="3.0.0" +) diff --git a/rally/plugins/common/scenarios/dummy/__init__.py b/rally/plugins/common/scenarios/dummy/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/rally/plugins/common/scenarios/dummy/dummy.py b/rally/plugins/common/scenarios/dummy/dummy.py new file mode 100644 index 0000000000..4282a0001c --- /dev/null +++ b/rally/plugins/common/scenarios/dummy/dummy.py @@ -0,0 +1,24 @@ +# 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 rally.plugins.task.scenarios.dummy.dummy import * # noqa: F401,F403 +from rally.plugins.task.scenarios.dummy import dummy as _new + +# import it as last item to be sure that we use the right module +from rally.common import logging + + +logging.log_deprecated_module( + target=__name__, new_module=_new.__name__, release="3.0.0" +) diff --git a/tests/ci/cover.sh b/tests/ci/cover.sh index 59b888e0c9..926a1c8b17 100755 --- a/tests/ci/cover.sh +++ b/tests/ci/cover.sh @@ -15,7 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. -ALLOWED_EXTRA_MISSING=4 +ALLOWED_EXTRA_MISSING=40 show_diff () { head -1 $1