Merge "Get rid of monkey patching work around for Python 2 in main.py"

functest/run.py

@@ -13,9 +13,9 @@
 
 from __future__ import print_function
 
-import eventlet
-eventlet.monkey_patch(thread=False)
+import ironic_discoverd.test  # noqa - pulls in monkey patching
 
+import eventlet
 import os
 import re
 import shutil

ironic_discoverd/main.py

@@ -11,8 +11,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
+
 import eventlet
-eventlet.monkey_patch(thread=False)
+eventlet.monkey_patch(thread=(sys.version_info < (3, 3)))
 
 import argparse
 import functools

ironic_discoverd/test/__init__.py

@@ -12,4 +12,4 @@
 # limitations under the License.
 
 import eventlet
-eventlet.monkey_patch(thread=False)
+eventlet.monkey_patch(thread=False)  # thread=True breaks func tests