From 980acf1f029af6dc765ed2616515d488b0e8aef9 Mon Sep 17 00:00:00 2001 From: Chris Dent Date: Mon, 3 Sep 2018 13:01:13 +0100 Subject: [PATCH] Empty __init__.py files that should be empty * placement/db/__init__.py is a non-functional hold over from nova there is no active code in it * placement/tests/functional/__init__.py was monkey patching eventlet, which placement does not use * placement/tests/unit/__init__.py was registering oslo versioned objects, which placement does not do Change-Id: Id9cfc14d39421aae7307e180bd82aaeaec00335d --- placement/db/__init__.py | 13 ----------- placement/tests/functional/__init__.py | 25 --------------------- placement/tests/unit/__init__.py | 30 -------------------------- 3 files changed, 68 deletions(-) diff --git a/placement/db/__init__.py b/placement/db/__init__.py index 30011101e..e69de29bb 100644 --- a/placement/db/__init__.py +++ b/placement/db/__init__.py @@ -1,13 +0,0 @@ -# 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. -"""Use placement.db.api instead. In the past this file imported * from there, -which led to unwanted imports.""" diff --git a/placement/tests/functional/__init__.py b/placement/tests/functional/__init__.py index e74717f86..e69de29bb 100644 --- a/placement/tests/functional/__init__.py +++ b/placement/tests/functional/__init__.py @@ -1,25 +0,0 @@ -# Copyright (c) 2011 Justin Santa Barbara -# -# 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. - -""" -:mod:`functional` -- Nova functional tests -===================================================== - -.. automodule:: nova.tests.functional - :platform: Unix -""" - -import eventlet - -eventlet.monkey_patch(os=False) diff --git a/placement/tests/unit/__init__.py b/placement/tests/unit/__init__.py index ef2a53907..e69de29bb 100644 --- a/placement/tests/unit/__init__.py +++ b/placement/tests/unit/__init__.py @@ -1,30 +0,0 @@ -# Copyright 2010 United States Government as represented by the -# Administrator of the National Aeronautics and Space Administration. -# 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. - -""" -:mod:`nova.tests.unit` -- Nova Unittests -===================================================== - -.. automodule:: nova.tests.unit - :platform: Unix -""" - -from placement import objects - -# NOTE(comstud): Make sure we have all of the objects loaded. We do this -# at module import time, because we may be using mock decorators in our -# tests that run at import time. -objects.register_all()