openstack
/
neutron
Code Issues Proposed changes

Simplify RootHelperProcess._read_stream() 

select() itself has timeout mechanism, so we do not need to use
wait_until_true wrapper.

Related-Bug: #1674557
Change-Id: I35bc4716f0d1e0d92e7b7a3f6dcb6978e9d725f9
This commit is contained in:
Akihiro Motoki 2017-03-21 06:48:13 +00:00
parent f48dbeda5c
commit a7898c5495
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
neutron/tests/common/net_helpers.py
View File

@ -16,7 +16,6 @@
import abc
from concurrent import futures
import contextlib
import functools
import os
import random
import re
@ -289,11 +288,9 @@ class RootHelperProcess(subprocess.Popen):
@staticmethod
def _read_stream(stream, timeout):
if timeout:
poll_predicate = functools.partial(
select.select, [stream], [], [], 1)
common_utils.wait_until_true(
lambda: poll_predicate()[0], timeout, 0.1,
RuntimeError('No output in %.2f seconds' % timeout))
rready, _wready, _xready = select.select([stream], [], [], timeout)
if not rready:
raise RuntimeError('No output in %.2f seconds' % timeout)
return stream.readline()
def writeline(self, data):