From 9ea82dbe5a296e9c395c3a4ba38233bdd65975ed Mon Sep 17 00:00:00 2001
From: liusheng <liusheng@huawei.com>
Date: Fri, 7 Jul 2017 11:22:41 +0800
Subject: [PATCH] Fix the tempest gate by moving the monkey patch statements

The tempest will start a thread to run tempest, if we monkey patch the
libs without os in root dir of Mogan code tree, the tempest thread will
never be scheduled to run. This change distribute the monkey_patch
statements to mogan/cmd, mogan/tests/unit and mogan/tests/functional.

Closes-Bug: 1702822

Change-Id: I6300030539bb40ce839a508628dab4a68edf6676
---
 mogan/__init__.py                  | 22 ----------------------
 mogan/cmd/__init__.py              |  8 ++++++++
 mogan/tests/functional/__init__.py | 17 +++++++++++++++++
 mogan/tests/unit/__init__.py       |  2 ++
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/mogan/__init__.py b/mogan/__init__.py
index c76ea71d..e69de29b 100644
--- a/mogan/__init__.py
+++ b/mogan/__init__.py
@@ -1,22 +0,0 @@
-# Copyright 2016 Huawei Technologies Co.,LTD.
-# 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.
-
-import os
-
-os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
-
-import eventlet
-
-eventlet.monkey_patch(os=False)
diff --git a/mogan/cmd/__init__.py b/mogan/cmd/__init__.py
index 0ef4879d..d557937e 100644
--- a/mogan/cmd/__init__.py
+++ b/mogan/cmd/__init__.py
@@ -13,6 +13,14 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+
+import os
+
+os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
+
+import eventlet
+
 import oslo_i18n as i18n
 
+eventlet.monkey_patch(os=False)
 i18n.install('mogan')
diff --git a/mogan/tests/functional/__init__.py b/mogan/tests/functional/__init__.py
index e69de29b..4e0b512d 100644
--- a/mogan/tests/functional/__init__.py
+++ b/mogan/tests/functional/__init__.py
@@ -0,0 +1,17 @@
+# Copyright 2017 Huawei Technologies Co.,LTD.
+# 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.
+import eventlet
+
+eventlet.monkey_patch(os=False)
diff --git a/mogan/tests/unit/__init__.py b/mogan/tests/unit/__init__.py
index 5d8cb675..b1a67556 100644
--- a/mogan/tests/unit/__init__.py
+++ b/mogan/tests/unit/__init__.py
@@ -20,9 +20,11 @@
 .. automodule:: mogan.tests.unit
    :platform: Unix
 """
+import eventlet
 
 from mogan import objects
 
+eventlet.monkey_patch(os=False)
 # NOTE(Shaohe Feng): 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.