From aba0187daac57d9363f96e5a69e41358ee1f6816 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 8 Dec 2014 16:16:39 -0500 Subject: [PATCH] move eventlet GREENDNS override to top level Instead of working around this in 3 places, only do the import override at the top level. There were comments left by mikal to do this after the pbr switch which is now done. Change-Id: I3ec281dd016ad904e9f323630324e70a002a037d --- nova/tests/functional/__init__.py | 22 ---------------------- nova/tests/unit/__init__.py | 22 ---------------------- 2 files changed, 44 deletions(-) diff --git a/nova/tests/functional/__init__.py b/nova/tests/functional/__init__.py index d34fc4925..e74717f86 100644 --- a/nova/tests/functional/__init__.py +++ b/nova/tests/functional/__init__.py @@ -20,28 +20,6 @@ :platform: Unix """ -# TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR -import os -import sys -import traceback - - -# NOTE(mikal): All of this is because if dnspython is present in your -# environment then eventlet monkeypatches socket.getaddrinfo() with an -# implementation which doesn't work for IPv6. What we're checking here is -# that the magic environment variable was set when the import happened. -# NOTE(dims): Prevent this code from kicking in under docs generation -# as it leads to spurious errors/warning. -stack = traceback.extract_stack() -if ('eventlet' in sys.modules and - os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes' and - (len(stack) < 2 or 'sphinx' not in stack[-2][0])): - raise ImportError('eventlet imported before nova/cmd/__init__ ' - '(env var set to %s)' - % os.environ.get('EVENTLET_NO_GREENDNS')) - -os.environ['EVENTLET_NO_GREENDNS'] = 'yes' - import eventlet eventlet.monkey_patch(os=False) diff --git a/nova/tests/unit/__init__.py b/nova/tests/unit/__init__.py index 31822c151..6446a8a73 100644 --- a/nova/tests/unit/__init__.py +++ b/nova/tests/unit/__init__.py @@ -22,28 +22,6 @@ :platform: Unix """ -# TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR -import os -import sys -import traceback - - -# NOTE(mikal): All of this is because if dnspython is present in your -# environment then eventlet monkeypatches socket.getaddrinfo() with an -# implementation which doesn't work for IPv6. What we're checking here is -# that the magic environment variable was set when the import happened. -# NOTE(dims): Prevent this code from kicking in under docs generation -# as it leads to spurious errors/warning. -stack = traceback.extract_stack() -if ('eventlet' in sys.modules and - os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes' and - (len(stack) < 2 or 'sphinx' not in stack[-2][0])): - raise ImportError('eventlet imported before nova/cmd/__init__ ' - '(env var set to %s)' - % os.environ.get('EVENTLET_NO_GREENDNS')) - -os.environ['EVENTLET_NO_GREENDNS'] = 'yes' - import eventlet eventlet.monkey_patch(os=False)