From 7da3a698658bcc2188caa95ba2f735becd99caee Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Thu, 30 May 2013 17:44:54 +1000 Subject: Import eventlet patch from oslo. This was abandoned once before: https://review.openstack.org/#/c/25781/ However this is not to do with packaging. This is required if we use eventlet subprocess module (like we should be) in jenkins tests for python2.6. Also imports patch_tox_venv.py. This is a cutdown version of what would happen in run_tests.sh but for tox environments which is how jenkins runs tests now. Change-Id: I369c3e464dfbe3a754f90db58785e97ac87b36c0 --- contrib/redhat-eventlet.patch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 contrib/redhat-eventlet.patch (limited to 'contrib') diff --git a/contrib/redhat-eventlet.patch b/contrib/redhat-eventlet.patch new file mode 100644 index 00000000..cf2ff53d --- /dev/null +++ b/contrib/redhat-eventlet.patch @@ -0,0 +1,16 @@ +--- .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py.orig +2011-05-25 +23:31:34.597271402 +0000 ++++ .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py +2011-05-25 +23:33:24.055602468 +0000 +@@ -32,7 +32,7 @@ + setattr(self, attr, wrapped_pipe) + __init__.__doc__ = subprocess_orig.Popen.__init__.__doc__ + +- def wait(self, check_interval=0.01): ++ def wait(self, check_interval=0.01, timeout=None): + # Instead of a blocking OS call, this version of wait() uses logic + # borrowed from the eventlet 0.2 processes.Process.wait() method. + try: + -- cgit