x
/
mogan
Code Issues Proposed changes

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
This commit is contained in:
liusheng 2017-07-07 11:22:41 +08:00
parent c9e4fe340b
commit 9ea82dbe5a
4 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
mogan/__init__.py
View File

@ -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)

8
mogan/cmd/__init__.py
View File

@ -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')

17
mogan/tests/functional/__init__.py
View File

@ -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)

2
mogan/tests/unit/__init__.py
View File

@ -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.