diff options
| author | Lorin Hochstein <lorin@isi.edu> | 2011-11-09 14:00:55 -0500 |
|---|---|---|
| committer | Lorin Hochstein <lorin@isi.edu> | 2011-11-09 14:54:16 -0500 |
| commit | 9175822ffeb89268afc6db7900f8b45d738e108c (patch) | |
| tree | 618f86ab4861205be5041a65ee24b3d47935b66f /contrib | |
| parent | e42fe8565cc44eee77df8cba5634ec1760ccc27e (diff) | |
| download | nova-9175822ffeb89268afc6db7900f8b45d738e108c.tar.gz nova-9175822ffeb89268afc6db7900f8b45d738e108c.tar.xz nova-9175822ffeb89268afc6db7900f8b45d738e108c.zip | |
Workaround for eventlet bug with unit tests in RHEL6.1.
This adds a patch to fix the broken eventlet code that's installed in the
virtualenv.
Fixes bug 884915
Change-Id: I6dbf755abbc5a52208de3dd892257ce39686d396
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/redhat-eventlet.patch | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/contrib/redhat-eventlet.patch b/contrib/redhat-eventlet.patch new file mode 100644 index 000000000..cf2ff53d5 --- /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: + |